pinto
update
Merge branch 'master' of https://github.com/biaccioly/corgi-day

Conflicts:
	.DS_Store