Commit with Suman's Changes.
Merge branch 'master' of https://github.com/mdtusz/353-project

Conflicts:
	application/models/.events_model.php.swp