make things cleaner
Merge branch 'master' of github.com:Sulkymogen/gameskel

Conflicts:
	src/include/game/Element.h