bg
Merge branch 'master' of github.com:bweintra/cheap-date

Conflicts:
	db/seeds.rb