Bringing my repo up to date with the main repo.
Added skeleton for SetupActivity class
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/edu/ggc/it/schedule/ScheduleActivity.java
Add Location class, LocationList class, and change onactionlistenner on
Find button.
Change ggc_map and edit text for building A button
Added Dating button and layout to make this Activity accessible.
Fixing merge conflicts
Merge branch 'master' of https://github.com/jsmallwo/ggc-connect.git
Fixed some import errors
Merged with upstream/master and created ScheduleActivity that now works
properly.
Merge pull request #17 from rramsaro/schedule-feature

Merged with upstream/master and created ScheduleActivity that now works
Merge remote-tracking branch 'upstream/master'

Conflicts:
	res/values/strings.xml
	src/edu/ggc/it/Main.java
Merge commit
Fix mismatched brace
Removed unnecessary imports
Merge pull request #18 from jsmallwo/master

Add dating button
Added building images
Merge remote-tracking branch 'upstream/master'
edit main class
Merge pull request #19 from thaives/master

Direction feature
fixing conflicts