test
Update test.txt
testing changes to file
Update Player.java
Merge branch 'Luis' of https://github.com/GoogleJump/ZeroG into Luis

Conflicts:
	test.txt
Merge branch 'Luis' of https://github.com/GoogleJump/ZeroG into Luis
Merge branch 'master' of https://github.com/GoogleJump/ZeroG into Luis

Conflicts:
	Player.java
Merge pull request #5 from GoogleJump/Luis

Luis