Basic Battle Screen Implementation
Merge branch 'master' of https://github.com/dburgnerjr/TCCHackathon

Conflicts:
	app/controllers/index.js