- init
Merge branch 'master' of github.com:theorm/cnf

* 'master' of github.com:theorm/cnf:
  Initial commit

Conflicts:
	.gitignore