there is nothing even being committed??
Merge branch 'navcontroller'