first commit
Merge https://github.com/stevenyoon/CIS121_FinalProj