first commit
Add images button
second commit
fix main class
first commit
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
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