first commit
Add images button
Added ScheduleActivity with a button
Merge pull request #8 from rramsaro/schedule-feature

Added ScheduleActivity with a button
second commit
fix main class
first commit
modified gitignore
first commit and pull
Merge pull request #12 from dewguzzler/master

sample pull request
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