initial commit
Merge branch 'master' of github.com:nherment/doctasia

Conflicts:
	.gitignore