Merge branch 'master' of https://github.com/crystalist/ggc-connect.git
Merge branch 'master' into myfeature
Merge remote-tracking branch 'origin/master' into myfeature
first commit
Add images button
second commit
fix main class
first commit
Bringing my repo up to date with the main repo.
modified gitignore
first commit and pull
Merge pull request #12 from dewguzzler/master

sample pull request
Added skeleton for SetupActivity class
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/edu/ggc/it/schedule/ScheduleActivity.java
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/edu/ggc/it/Main.java
Merge remote-tracking branch 'upstream/master'
Merge pull request #14 from thaives/master

My feature
Added Dating button and layout to make this Activity accessible.
Fixing merge conflicts
Merge branch 'master' of https://github.com/jsmallwo/ggc-connect.git