Merge remote-tracking branch 'origin/fix-nav-menu'
New Nav
Merge branch 'fix-nav-menu' into gh-pages
spelling errors

spelling errors
Merge pull request #267 from SUNY-Albany-CCI-INF362/chris-fixes

spelling errors
new nav?

and <style> removed from index.
Merge branch 'fix-nav-menu'
New nav

with cleaned up scss. No <style> in index anymore
Merge branch 'nav-menu'
Merge pull request #268 from SUNY-Albany-CCI-INF362/nav-menu

Nav menu
Scss from the <style> in index

was put into the main.scss
Merge branch 'nav-menu'
joyride update

took joy ride out of the default file so unique joyrides can be called
for each page.
Merge branch 'nav-menu'
Merge pull request #269 from SUNY-Albany-CCI-INF362/nav-menu

Nav menu
Merge branch 'master' into gh-pages
Merge branch 'master' of https://github.com/SUNY-Albany-CCI-INF362/honey-badgers
random fixes
Merge branch 'master' into gh-pages