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
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
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