Cleaned up navigation and nav directive
Readme added locally
Fixing readme
Conflicts resloved