initial commit
Merge branch 'master' of github.com:Blahah/carpel

Conflicts:
	.gitignore
	README.md