updated
Merge branch 'master' of https://github.com/HTML5ExpertsHackathon/kusoge

Conflicts:
	test.txt