Crap
Merge branch 'master' of https://github.com/ralphsb/InnoChallenge

Conflicts:
	build/classes/Webserver/MetadataServlet.class
	src/Webserver/MetadataServlet.java