Merge origin/master

Conflicts:
	src/Main.java