Initial commit
Merge branch 'master' of github.com:kipkins/Summer2014