Duplicated identifiers bug fixed
Merge branch 'master' of https://github.com/chijuzipi/EECS450_project

Duplicated identifier bug fixed. Results from Fan