effects added in event page
merge conflict
Merge pull request #82 from KodeKracker/master

effects added in event page