update format
Merge branch 'master' of github.com:talklibre/format

Conflicts:
	README.md