updates and error fix
Merge branch 'master' of https://github.com/cpottamus/EECS339_Project_2

* 'master' of https://github.com/cpottamus/EECS339_Project_2:
  bugfix