Add user microposts
Merge branch 'user-microposts'

Conflicts:
	app/views/users/edit.html
	app/views/users/new.html.erb