cleaning up discrepancies
Merge pull request #54 from n2diving/frontendbranch

Frontendbranch
still dealing with merge issues on lesson show
Merge branch 'master' of https://github.com/n2diving/fistfive into frontendbranch