Improve the README file
Improve the README file
Update Gemfile.lock for Heroku
Finish static pages
Finish static pages
Merge branch 'static-pages'

Conflicts:
	.c9/metadata/tab5