Stop spamming your scanners all over the code
Merge remote-tracking branch 'origin/master'

Conflicts:
	Battle.java
Merge branch 'master' of https://github.com/nsgomez/txtmagicka