Merge tag 'v1.0.4' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 20 Jan 2017 15:38:22 +0000 (10:38 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 20 Jan 2017 15:38:22 +0000 (10:38 -0500)
fixing syntax error in class flight file


Trivial merge