alteracao de formato
Merge branch 'master' of https://github.com/wbrandaosoares/fw-html5

Conflicts:
	public/css/dev/style.css