css added for popups on registrations
removed merge conflicts on registration page
Merge pull request #134 from rishy/master

added new css on registration popups
event page edited
Merge branch 'master' of https://github.com/KodeKracker/Titiksha-website