Main Page Done
Merge branch 'master' of https://github.com/jlomeo/3345FinalProj