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