add static pages
finish static pages
Merge branch 'master' of heroku.com:stark-shelf-1852

Conflicts:
	app/views/static_pages/help.html.erb
	app/views/static_pages/home.html.erb
Change to postgresql
finish style