first pass
Merge branch 'master' of github.com:chrishale/CocoaPop
changed .gitignore