Initial commit from local git
Merge branch 'master' of https://github.com/AlexRoscoe/cs

Initial merge to sync local git with remote git