# added a little bit more structure to the gamestate files
+ added a bit more game logic (state stack)
Merge branch 'master' of github.com:Jojendersie/Monolith

Conflicts:
	Monolith.vcxproj.filters
	src/game.hpp
	src/gamestates/gsmain.cpp
+ direct input of keyboard and mouse (both called keys)
+ KeyToChar to convert keys to printable characters (german keyboard only - glfw 3.1 will include this feature)
# renamed Keys to VirtualKey to differentiate to the direct input
# included filelib update which fixes some memory leaks