commit to pull
Merge branch 'bas' of github.com:lshoek/realimaze into bas

Conflicts:
	Realimaze/Realimaze.sdf
	Realimaze/Realimaze/Engine.cpp
sdf :)