Oscar was here
Merge branch 'master' of https://github.com/oscarkraemer/arcada-projekt

Conflicts:
	HelloWorld/src/HelloWorld.java
Generator