Initial commit
add test
Merge branch 'master' of https://github.com/jiam/test
Merge branch 'master' of https://github.com/jiam/test

Conflicts:
	README.md
Create test2