Some form of nav bar methinks
Merge branch 'master' of github.com:Chybby/Collaborate