Create README.md
modicacion app/config.php
modicacion public/config.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/lib/config.php
modificacion config frontend