added events in are activity
editted events in area
actually added the files this commit
Merge branch 'master' of https://github.com/j-a-c/mdevproject

Conflicts:
	src/com/joshuac/campusconnect/UpcomingActivity.java