testsida
Merge branch 'master' of https://github.com/D4GGe/webProject

Conflicts:
	7chan/src/main/java/goup7/view/NewUserBB.java
	7chan/src/main/java/group7/ctrl/NewUserCtrl.java
test