Fixed make errors
Merge branch 'master' of github.com:vincentleest/ECE496