fix
small change
fix conflict
Merge branch 'master' of github.com:ctzsm/HCI_prototype
navbar fixed