put the code back

then deleted it again
Merge branch 'master' of https://github.com/nsgomez/txtmagicka

Conflicts:
	Player.java
	package.bluej