update readme
Merge branch 'master' of https://github.com/jrevatta/daleuncafe

Conflicts:
	README.txt
Revert "update readme"

This reverts commit e262cf0867e8b590cc31ed803a8cb248da182f54.

Conflicts:
	README.txt