stuff
fixed merge errors
Merge branch 'master' of https://github.com/ZacMcClain/FinalProject

merging files