Initial commit from ST108 Lab
Merge branch 'master' of github.com:teklanis/cs442

Initial merge to sync local git with remote git