Merge branch 'master' of https://github.com/marvin659/hkfxbigproject

Conflicts:
	src/main/java/Main.java