Hmm can't remember what this was..
Merge branch 'master' of https://github.com/ucdavis/Badges

Conflicts:
	Badges/Controllers/BadgeController.cs