Just need to commit won't push
Merge branch 'master' of
git@github.com:lchrislee/Pokeman-Parody-Adaptation.git

Conflicts:
	src/LoginScreen/LoginScreen.java
	src/map/Direction.java
Merge branch 'master' of
git@github.com:lchrislee/Pokeman-Parody-Adaptation.git

Conflicts:
	src/BattleGUI/ActionSelection.java
	src/BattleGUI/AttackSelection.java
	src/BattleGUI/TextScreen.java