Merge origin/master
Merge origin/master

Conflicts:
	src/sourceCode/Main.java