--- edit read me
Merge branch 'master' of https://github.com/gonsakon/gittest

Conflicts:
	readme.md