price change: £3.80
Merge remote-tracking branch 'heroku/master'

Conflicts:
	app/views/game_reminder_mailer/reminder_email.html.slim
merge conflict with heroku repo