someone killed a global variable
Merge branch 'master' of github.com:orablu/EECS391_Pr01