hello world
Charlie Merge Merge branch 'master' of https://github.com/mboker/happy_hour_hitcher

Conflicts:
	config/database.yml
	db/schema.rb
Merge branch 'master' of https://github.com/mboker/happy_hour_hitcher