fixed some lines up
Merge branch 'master' of https://github.com/TomaQ/TextRPG

Conflicts:
	Battle.java