Samarkan fail
Samarkan successful
Edited nav bar
Merge branch 'semani2-branch-sp'
final version