BOOM
Merge branch 'master' of http://github.com/simondesoza/EventPlanner

Conflicts:
	README.md

sethudalama