primer commit
Merge branch 'master' of github.com:ncoma/CC7-2014