del
Merge branch 'master' of https://github.com/mcheung63/peter-swing

Conflicts:
	target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst