signup.html
Merge branch 'master' of https://github.com/Sayi/Store.git

Conflicts:
	src/com/store/StoreConfig.java
	webapps/WEB-INF/pages/signup.html
	webapps/resource/css/ls.css