Fixed top navigation
Resolved conflict
Resolved conflict 2
Merge branch 'master' of github.com:JoshFB/Talent_Hacked_Code into dashboardAll
Merge pull request #22 from JoshFB/dashboardAll

Dashboard all