Added user microposts
retrying addition of user microposts
Merge branch 'user-microposts'

Conflicts:
	app/views/.DS_Store