Add capify
Merge branch 'master' of https://github.com/Canfly/amalgama

Conflicts:
	.gitignore