updates
Merge branch 'master' of github.com:bthwaites/ECE6130_FinalProject