final project commit 3
Merge branch 'master' of https://github.com/j0sanc02/CIS411FinalProject