_nav partial Quickfix

Changed where 'render' appears in files
Merge branch 'HTML/SCSS'
Hotfix

- Missed a merge somewhere along the lines, nav code was broken
- Changed the _nav partial back to application.html.erb
- Fixed what the nav_link helper method to target correct class
Fixed Merge Conflict