added comments for clearity
Merge branch 'master' of https://github.com/ZacMcClain/FinalProject
fixed merge conflixs
fixed yet more merge conflixs
comments
merge conflixs are no more