Added Dummy Data - Errors commented out
Merge branch 'Cad-CombinedSchedule' of https://github.com/starlest/cits3200groupg into Cad-CombinedSchedule

Conflicts:
	GuildWayfinding/bin/GuildWayfinding.apk
	GuildWayfinding/bin/classes.dex
	GuildWayfinding/bin/classes/com/example/guildwayfinding/DBHelper.class

GuildWayfinding/bin/classes/com/example/guildwayfinding/SearchStaffActiv
ity.class
	GuildWayfinding/bin/resources.ap_
	GuildWayfinding/src/com/example/guildwayfinding/DBHelper.java

GuildWayfinding/src/com/example/guildwayfinding/SearchStaffActivity.java