dewf
Merge branch 'master' of https://github.com/Borimino/WebTekWebShop.git
dwdw
Merge branch 'master' of https://github.com/Borimino/WebTekWebShop.git

Conflicts:
	TomcatServer/src/ChatService.java
Beautifying and CSS