pulled and merged
merged
added update to users
added update method.
Merge branch 'master' of github.com:ikenohate09/design_exchange

Conflicts:
	.gitignore
	solr/data/development/index/segments.gen
added validations. Fixed typo in design_methods show.html.erb as well