Upload
Merge branch 'master' of github.com:IAMFELIPESOUZA/clima

Conflicts:
	css/weather.css
	index.html
	showcase/css/style.css
	showcase/index.html