my comments added for realz...
Merge branch 'master' of https://github.com/jharris4491/cs425