initial git commit
Merge https://github.com/cbourke/CSCE156