Merge branch 'master' of github.com:pinventado/yolanda-infoclassifier

Conflicts:
	README.md
Merge branch 'master' of github.com:pinventado/yolanda-infoclassifier