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

Conflicts:
coverage/.last_run.json
coverage/.resultset.json
coverage/index.html
features/step_definitions/user_steps.rb
log/test.log
con
Merge branch 'master' of https://github.com/CIT597Project/DreamDesign

Conflicts:
	log/test.log