view without content
Merge branch 'master' of https://github.com/mrgoodboy/doitmrw into graham

Conflicts:
	app/models/content.rb
minor change for heroku
minor change for heroku 3
stub next content