Merge pull request #250 from sunnyLA4/master

few names modified
Merge remote-tracking branch 'upstream/master' into fresh
one mega event added | need to add database entry code
few moew changes
Merge pull request #30 from sunnyLA4/fresh

one mega added