Wrap long strings
Merge branch 'master' of https://github.com/davidtlee/sample_app

Conflicts:
	app/helpers/microposts_helper.rb