completed 3-track
temp
Merge branch 'sales-page'

Conflicts:
	app/controllers/myactions_controller.rb
	db/schema.rb
intensity required