trying to reach master
Merge branch 'master' of https://github.com/hmhaley/HenrySamMartin

Conflicts:
	db/schema.rb
	log/development.log