navbar link ok
Merge branch 'fixed_bug_IU_index'
fixing conflict in navbar