edited microposts
Merge branch 'master' of https://github.com/coreynagel/software_methods_project

Conflicts:
	app/controllers/microposts_controller.rb
	app/views/static_pages/_signed_in_home.html.erb
Merge branch 'master' of https://github.com/coreynagel/software_methods_project