Merge branch 'master' of https://github.com/CSUChicoSoftwareEngineering/the-engineers into d_branch

Conflicts:
	the3DMarket/app/controllers/user_controller.rb
	the3DMarket/app/views/user/index.html.haml
Merge branch 'd_branch' of https://github.com/CSUChicoSoftwareEngineering/the-engineers into d_branch

Conflicts:
	the3DMarket/app/controllers/user_controller.rb
	the3DMarket/app/views/user/index.html.haml