home additions
Merging test
Merge branch 'master' of git://github.com/tftilma/Game

Conflicts:
	test.txt