Adding some changes
Merge branch 'Feature1'

Conflicts:
	app/assets/javascripts/microposts.js.coffee