prod
Merge branch 'master' of heroku.com:tykchow-sabre-scoreboard

Conflicts:
	index.html
Merge branch 'master' into staging