are you happy now matt

is this what you want from me
Merge branch 'master' of https://github.com/nsgomez/txtmagicka

Conflicts:
	Player.ctxt