ed
Merge branch 'master' of https://github.com/bleujin/gitsample.git

Conflicts:
	gitsample/test/net/ion/bleujin/TestHelloWorld.java
..