TEMPTESTER DELETED
Merge branch 'master' of https://github.com/Borimino/WebTekWebShop.git

Conflicts:
	TomcatServer/src/TempTESTER.java
Merge branch 'master' of https://github.com/Borimino/WebTekWebShop.git

Conflicts:
	TomcatServer/src/TempTESTER.java