Disable first-day discount
Merge branch 'app-arch-sales-page' into app-arch-day-two
Merge branch 'app-arch-sales-page' into app-arch-day-two
Merge branch 'master' into app-arch-day-two
Merge branch 'app-arch-day-two'

Conflicts:
	source/application-architecture.html.haml
Remove discount notice