Here we go
Merge branch 'master' of github.com:leandrooriente/photo-portfolio

Conflicts:
	README.md