my bad bro
Merge branch 'master' of https://github.com/charlieouyang/ECE454Project2.git
again