added my events view controller, it actually works!
Merge branch 'master' of https://github.com/larissa88/EatSmart

Conflicts:
	iOS/EatSmart.xcodeproj/project.pbxproj