get changes to generate.sh from master
remove the static controller (use the main controller)
run ./generate.sh
Merge branch 'clean2'

Conflicts:
	app/assets/stylesheets/static.css.scss
	app/controllers/static_controller.rb