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

Conflicts:
	Code/DesExSearch/app/assets/stylesheets/de.css.scss
	Code/DesExSearch/app/views/layouts/custom.html.erb
	Code/DesExSearch/app/views/layouts/wide.html.erb