Initial commit
Merge branch 'master' of https://github.com/aowainati/cog

Conflicts:
	.gitignore