titles
Merge branch 'master' of github.com:moviepilot/trailer-game

Conflicts:
	app/assets/javascripts/views/game_instructions_screen.coffee