initial import
Merge branch 'master' of github.com:rtbox/cprm

Conflicts:
	.gitignore