initial csc305 commit
Merge branch 'master' of https://github.com/RyanMcDonald/csc305

Initial pull?