fix bugs
fix merge conflicts
Merge branch 'master' of github.com:sola92/ECE358-Project