Finish demo app.
Serve static assets.
Add a StaticPages controller
Finish static pages.
Finish static pages2.
Finish static pages3
Finish static pages on brabch master.
Merge branch 'user&micropost'

Conflicts:
	.idea/sample_app.iml
	.idea/workspace.xml
	app/views/layouts/application.html.erb
	config/routes.rb