Arrange order of collection, post new order of battle cards
Merge branch 'master' of https://github.com/ericapadilla/testRepo

Conflicts:
	api/controllers/CardController.js