111
Merge branch 'master' of https://github.com/histemiss/web.git

* 'master' of https://github.com/histemiss/web.git:
  111

Conflicts:
	WebRoot/css/default.css
	WebRoot/index.jsp
	WebRoot/jquery-1.7.2.js
	WebRoot/jquery-ui-1.8.20/jquery-1.7.2.js
	WebRoot/js/jquery-1.7.2.js
	WebRoot/login.jsp
	WebRoot/register.jsp
	src/login/Login.java
	src/register/Register.java