Updated version
Merge branch 'master' of github.com:michballard/fhellow
Merge branch 'master' of github.com:michballard/fhellow

Conflicts:
	.gitignore
	app/views/messaging/index.html.erb
	config/secrets.yml
Michelle's 'what we learned' added