Merge branch 'master' of https://github.com/ikenohate09/design_exchange

Conflicts:
	Code/DesExSearch/app/controllers/de_controller.rb