Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Play.java
Minor Amendment on Log Area

在Log Area加上第一行的內容
Merge branch 'master' of https://github.com/ng-ivan-hk/Legend-of-Doracity