Merge pull request #56 from Psybrus/master
authorJohn Kessenich <johnkslang@users.noreply.github.com>
Sun, 16 Aug 2015 17:07:50 +0000 (11:07 -0600)
committerJohn Kessenich <johnkslang@users.noreply.github.com>
Sun, 16 Aug 2015 17:07:50 +0000 (11:07 -0600)
Fixed VS2015 build


Trivial merge