text
Merge branch 'newmaster' of https://github.com/vlastachu/n1bounce into newmaster
Also add Text
Conflicts:
	src/GameCore.cpp