i dont know what these changes are
Merge branch 'master' of https://github.com/nsgomez/txtmagicka

Conflicts:
	Player.ctxt
	Player.java
	package.bluej