navbar
victor working
trying to settle conflicts
Merge pull request #15 from capms/curley

fixed duplicates in application.js
fixing conflicts
Merge pull request #16 from capms/navBar

Nav bar
made images links to user page