resolved conflicts
resolved conflicts
MathJax included
Merge branch 'master' of github.com:krushi123/lpms