New website layout + login functionality + creating new JSP pages and more
fixing git
Merge branch 'Bas' of https://github.com/utwente-di/di14 into Bas

Conflicts:
	Code/.gitignore
	Code/pom.xml
	Code/src/main/java/User.java
	Code/src/main/java/formHandlers/Login2.java
	Code/src/main/java/nl/utwente/thinktank/types/User.java
	Code/src/main/java/types/User.java
	Code/src/main/webapp/Checkout.jsp
	Code/src/main/webapp/css/stylesheet.css
	Code/src/main/webapp/index.html
	Code/src/main/webapp/index.jsp
	Code/src/main/webapp/login.jsp
	Code/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	Code/target/m2e-wtp/web-resources/META-INF/maven/nl.utwente.thinkthank/ThinkThank/pom.properties
	Code/target/m2e-wtp/web-resources/META-INF/maven/nl.utwente.thinkthank/ThinkThank/pom.xml
fixing git