Adam's stuff
Merge branch 'master' of https://github.com/agleason6/ECE6414_master
merge