Advanced Search now working!!!!
Merge branch 'master' of https://github.com/aarya123/CampusFeed

Conflicts:
	src/com/example/campusfeed/EventOrganizer.java
	src/com/example/campusfeed/MainActivity.java
	src/com/example/campusfeed/TimePickerEvent.java
Advanced search complete!
Advanced search complete!

Conflicts:
	project.properties
	res/menu/activity_main.xml
	src/com/example/campusfeed/MainActivity.java
Merge branch 'master' of https://github.com/aarya123/CampusFeed

Conflicts:
	project.properties
	src/com/example/campusfeed/MainActivity.java