Merge pull request #2 from smvdu/master

Merge pull request #132 from KodeKracker/master
event page edited
Merge branch 'master' of https://github.com/KodeKracker/Titiksha-website
removed merge conflicts in kodekracker-repo
removed merge conflicts from upstream
Merge pull request #148 from rishy/master

removed merge conflcts from upstream