fixed nav button animation
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/header.ejs
	views/navbar.ejs