Testing basic git commands
Merge branch 'master' of https://github.com/Clacious/CSCI