Merge pull request #2 from Shibby92/master

primi
update player
Character 1.00
Merge branch 'master' of https://github.com/GorjanGOA/Campapocalypse

Conflicts:
	src/Player.java
Merge pull request #8 from GorjanGOA/master

merge