Some basic fighting is happening. Updates to UI.
Merge branch 'master' of https://github.com/whiterson/mockingJay