following others
Merge branch 'master' of https://github.com/CIT597Project/DreamDesign

Conflicts:
	db/schema.rb