clean up
Merge branch 'master' of github.com:younix/sj

Conflicts:
	sj.c