Week 7 commit
Merge branch 'master' of https://github.com/NKU-2014-Fall-CSC601/newmanj5