etrte
Merge branch 'master' of https://github.com/araquach/laravelpractice

Conflicts:
	.gitignore
	laravelpractice.esproj/user.adamcarter.espressostorage