latest pull from master
Merge branch 'master' of https://github.com/g2-aj/cs304 into branch_kris
it smells like McDonald's in here, 5:47am
fixed annoying merge issues
Merge branch 'master' of https://github.com/g2-aj/cs304 into branch_kris
Merge branch 'master' of https://github.com/g2-aj/cs304 into branch_kris
Merge pull request #73 from g2-aj/branch_kris

merging kris_branch into master