fixed scroll working!
added jquery-lockfix
Merge pull request #127 from amida-tech/unifying-navbar

Unifying navbar