Check in changes
Merge branch 'master' of https://github.com/mmammel/projects

Conflicts:
	java/regex/MatchesTest.class
	java/regex/MatchesTest.java