first commit
Merge branch 'master' of github.com:patrov/cnam

Conflicts:
	.gitignore