Parent SHA1:78a76c4 (Fix illegal character in main.css during resolving conflicts)
resolved conflicts with old changes
Merge branch 'master' of git.pantoto.org:karnataka-hybrid-micro-devices-ltd-khmdl-website/khmdl-website
Conflicts:
mouchak/static/css/main.css
