fix shit
Merge branch 'master' of https://github.com/g2-aj/cs304 into branch_kris
Merge pull request #74 from g2-aj/branch_kris

Branch kris