Merge branch 'feature/reorganize' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 12 Dec 2017 21:58:09 +0000 (16:58 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 12 Dec 2017 21:58:09 +0000 (16:58 -0500)

Trivial merge