Initial
Commit Julian
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/Main.java
Merge remote-tracking branch 'origin/dev' into dev