testing
Merge branch 'master' into dev
Fixed classpath
Merge branch 'dev' of github.com:Farenheight/Lidkoping-SH into dev