Merge branch 'master' of https://github.com/smvdu/Titiksha-website into fresh
modified css
Merge branch 'fresh' of https://github.com/sunnyLA4/Titiksha-website into fresh
Merge pull request #194 from KodeKracker/master

merge conflict