formatting
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/sat/SATLexer.java
Regex methods