Changing to bob
Merge branch 'master' of https://github.com/siwthaneye/space

Conflicts:
	test.txt