getting ready to merge
Merge branch 'master' of https://github.com/brisull/mlbroster

Conflicts:
	app/js/app.js
	app/js/controllers.js
	app/js/services.js
	app/partials/player.html
	app/partials/team.html
More data plumbing