testando
Merge remote-tracking branch 'keepcalm/master'

Conflicts:
	.gitignore
	app/config/app.php
	readme.md