Fifth iterate :'(
Merge branch 'master' of heroku.com:section3output

Conflicts:
	lib/tasks/populate.rake
Add user microposts