Initial commit
Delete README.md
Merge branch 'master' of git://github.com/joentaus/testi

Conflicts:
	README.md
Merge branch 'master' of git://github.com/joentaus/testi

Conflicts:
	README.md
test