Initial commit
first commit
Merge branch 'master' of github.com:jumyou/jumyou

Conflicts:
	.gitignore
	README.md