BadCommit

revert revert!!
nav-barFIX

NAVBAR FIX !! ORI IS THE KING!
Merge remote-tracking branch 'origin/master'

Conflicts:
	crossfitThemeResponsive/js/scripts.js