initial commit
Merge branch 'master' of https://github.com/j99/teddy-bear

Conflicts:
	README.md