+page contato. blog
_modificações no content.css e shortcodes.css...
Merge branch 'master' of https://github.com/samuelmolinski/miniature-octo-archer

Conflicts:
	wp-content/themes/atlantes/assets/css/content.css
_iniciando - 03/04/2013
-GALLERY ALETRAÇÃO
Merge branch 'master' of https://github.com/samuelmolinski/miniature-octo-archer

Conflicts:
	wp-content/themes/atlantes/assets/css/content.css