por empezar proto fed
Merge branch 'master' of github.com:Litocruz/static into user-microposts

Conflicts:
	app/controllers/static_pages_controller.rb
	app/views/shared/_micropost_form.html.erb
Add user micropost finish unit 10