Infoscreen Ansatz
Merge branch 'master' of https://github.com/ggritzan/CG_Game_SoSe_2014

Conflicts:
	main.cpp