celso
Merge branch 'master' of https://github.com/dereckleme/desenvolvimento

Conflicts:
	public/css/style.css
	public/images/Thumbs.db