Signed-off-by: Peter <mcheung63@hotmail.com>
Signed-off-by: Peter <mcheung63@hotmail.com>
Signed-off-by: Peter <mcheung63@hotmail.com>
Merge branch 'master' of https://github.com/mcheung63/titan.git

Conflicts:
	src/main/java/com/titan/mainframe/MainFrame.java