Commit by local 1
Merge branch 'master' of https://github.com/yiochen/GithubTest.git

Conflicts:
	src/Main.java