this finally works
Merge branch 'master' of https://github.com/nexttopnerd/FinalProject