work on home page, sign in/sign up, qualities
updates to design
updates to design
work on home page, sign in/sign up, qualities
fixed merge conflict
design updates
Merge branch 'master' of https://github.com/pbd9970/select-my-store

Conflicts:
	design_server.rb
fixed merge conflict