Michael: Initial Commit
Merge branch 'master' of https://github.com/jibbs00/cmpt355project2-eric-julian-michael