polls e photos
Merge branch 'master' of https://github.com/lucasvs/desafio

Conflicts:
	app/Controller/PhotosController.php
Merge branch 'master' of https://github.com/lucasvs/desafio