nav added
Merge branch 'master' of https://github.com/JTFrancis/social_trainer into nav_layout