Initial commit
Merge branch 'temp1'

Conflicts:
	README.md
Merge branch 'master' of github.com:assue/testcake