look
Merge branch 'master' of github.com:Sulkymogen/gameskel

Conflicts:
	src/games/main.cc
	src/lib/Element.cc