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

Conflicts:
	features/step_definitions/user_steps.rb
Merge branch 'master' of https://github.com/CIT597Project/DreamDesign

Conflicts:
	features/step_definitions/user_steps.rb