laravel
Merge branch 'master' of https://github.com/yusukejoan12/aulanet

Conflicts:
	README.md