_app
Merge branch 'master' of https://github.com/samuelmolinski/drunken-octo-sansa

Conflicts:
	wp-config.php
Merge branch 'master' of https://github.com/samuelmolinski/drunken-octo-sansa
Merge branch 'master' of https://github.com/samuelmolinski/drunken-octo-sansa
-alteração no layout 1 etapa
_alteração no config
_alt
_alterções no layout
Merge branch 'master' of https://github.com/samuelmolinski/drunken-octo-sansa

Conflicts:
	wp-content/themes/vfgv2013/library/css/base.css
	wp-content/themes/vfgv2013/library/less/base.less