first commit
Merge branch 'master' of https://github.com/jenara112/OSU-Final-Project