First code commit
Merge branch 'master' of https://github.com/edjmore/CS196