Fixed include issue
Merge branch 'master' of github.com:wbjacks/engs115