smoothed out player motion
P2 controls added
Merge branch 'BattleUI'

Conflicts:
	src/BattleUI.java
fixed