Updated
Add static pages controler
Finish static pages
Merge branch 'static-pages'

Conflicts:
	.gitignore
	app/views/layouts/application.html.erb
	config/initializers/secret_token.rb
	config/routes.rb
	spec/spec_helper.rb