added error catching. deleted unused controller. fixed spacing
Merge branch 'master' of https://github.com/ericapadilla/testRepo

Conflicts:
	api/services/BattleService.js