dssf
Merge branch 'master' of https://github.com/mrhanit/s.git

Conflicts:
	src/dfa/a.java