initial check-in
Merge branch 'master' of http://github.com/5iDS/cnr2cnr