Merge branch 'master' into interface-design
Merge branch 'master' of https://github.com/justinlopez0/task-manager
Added Yahoo to nav