modified:   .gitignore
Merge branch 'master' of github.com:colintoal/cn