Slides
Merge branch 'master' of github.com:gangeli/ParsingTime

Conflicts:
	dist/time.jar
	etc/lib.jar
	src/time/JavaExample.java