photo upload function ok
Merge https://github.com/CIT597Project/DreamDesign

Conflicts:
	app/assets/images/direct-to-99-bg.webm
	app/controllers/application_controller.rb