cleaning up discrepancies
still dealing with merge issues on lesson show
Merge branch 'master' of https://github.com/n2diving/fistfive into frontendbranch
fixing duplicates on lesson controller
Merge branch 'master' of https://github.com/n2diving/fistfive into frontendbranch
conditional links in the nav bar