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

Conflicts:
	src/main/java/Main.java
Merge remote-tracking branch 'origin/master'