v1.0.12
object 1b58b216a3f9173534200db41b43a85a3bbeff76
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 8 Feb 2018 21:43:21 +0000 (16:43 -0500)
fixing git conflict in header