first commit
Merge branch 'master' of https://github.com/LevelSeven/doctopus

Conflicts:
	.gitignore
	README.md