decided navi color
Merge branch 'master' of https://github.com/rmusa/final_project
Merge branch 'master' of https://github.com/rmusa/final_project
new homepage layout
Merge branch 'master' of https://github.com/rmusa/final_project