ops
Merge branch 'master' of github.com:ifollow/papododia

Conflicts:
	app/views/home/index.html.erb~