add diff
Merge branch 'diff' of github.com:fkuo/node-fash into diff

Conflicts:
	bin/fash.js