Further attempt to resolve merge conflicts
authorLaury GvR <laury@gaslightmedia.com>
Mon, 28 Sep 2015 16:47:49 +0000 (12:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 28 Sep 2015 16:47:49 +0000 (12:47 -0400)
commitca4cd155ae4a30cd97588fd85dc40de4cdab8001
tree9316c6bb54f4e4cfad65b4264c4229ed33dd8e0a
parent894e49f3d36191dc25cce1d005f39a0ba4a25cc4
parentcc463db4acf7bea5b869694a00376042b9be21c2
Further attempt to resolve merge conflicts