Mario and Patrick broke everything
fixed ember app
Merge branch 'master' of github.com:bstoecker/elo_league

Conflicts:
	app/assets/javascripts/application.js