updates
Merge branch 'master' of https://github.com/hiperativo/corgi-day

Conflicts:
	.DS_Store
	public/teste.html
	public/teste.html.slim