Merge pull request #8 from rramsaro/schedule-feature

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

sample pull request
Merge branch 'master' into schedule-feature

Conflicts:
	src/edu/ggc/it/schedule/ScheduleActivity.java