Commit Attempt #1
Merge branch 'master' of https://github.com/khaynie/cpsc405