trimed down unneeded code
Merge branch 'master' of https://github.com/ZacMcClain/FinalProject