made home page look sexy
Merge branch 'master' of https://github.com/rmusa/final_project
fixed merge conflicts