commit
Merge branch 'master' of https://github.com/rommager/zoologics.git

Conflicts:
	ZooLogics/src/edu/radford/itec370/mainmethod/zoologics/gui/RecurrenceSchedulePanel.java