test
Merge remote branch 'origin/master'

Conflicts:
	projectx/WebContent/login.jsp
Added MD5 password - works
adding .gitignore
Merge branch 'master' of https://github.com/aleitamar/School

Conflicts:
	projectx/WebContent/login.jsp
	projectx/src/il/ac/telhai/finalProject/WebStoreHttpServlet.java
added error page and changed input field in home page
et
Merge branch 'master' of https://github.com/aleitamar/School.git

Conflicts:
	projectx/WebContent/home.jsp
	projectx/WebContent/login.jsp
	projectx/WebContent/products.jsp