first git commit, cst
Merge pull request #12 from ConorStefanini/master

first git commit, cst