Fixed several compile errors.
Merge branch 'master' of https://github.com/dw19375/SeniorDesign