cxvxcv
Merge branch 'master' of https://github.com/nsgomez/txtmagicka

Conflicts:
	package.bluej