Added ranking
Merge branch 'master' of https://github.com/ericapadilla/testRepo

Conflicts:
	api/services/BattleService.js
	api/services/UserService.js
	config/bootstrap.js