Merge pull request #73 from g2-aj/branch_kris

merging kris_branch into master
Merge branch 'master' of https://github.com/g2-aj/cs304 into branch_kris