simplified
Merge branch 'master' of https://github.com/ryant26/FinalProject
simplified