almost final
Merge branch 'master' of https://github.com/emocentmagar/project-management into lalit
navigation integrated
conflicts merged
Merge pull request #35 from emocentmagar/lalit

Lalit