up
Merge branch 'master' of https://github.com/mrhai/s.git

Conflicts:
	src/s/s.java