travis-ci fake push
Merge branch 'master' of github.com:yanatan16/node-fanin

Conflicts:
	README.md