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
merge confict
removed merge conflicts in kodekracker-repo
removed merge conflicts from upstream
Merge pull request #148 from rishy/master

removed merge conflcts from upstream
Merge branch 'KodeKracker-master'
Merge pull request #149 from rishy/master

removed merge conflcts from Kodekracker
changed look of side navigation
Merge pull request #151 from rishy/master

changed look of side navigation
Merge pull request #150 from sunnyLA4/master

images renamed in css
Merge remote-tracking branch 'upstream/master'
contact changed