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

Conflicts:
	wp-content/themes/vfgv2013/library/css/base.css
_mudanças
Merge branch 'master' of https://github.com/samuelmolinski/drunken-octo-sansa
_finaly
Merge branch 'master' of https://github.com/samuelmolinski/drunken-octo-sansa

Conflicts:
	wp-content/themes/vfgv2013/assets/image/participou.png
	wp-content/themes/vfgv2013/library/css/base.css
	wp-content/themes/vfgv2013/library/less/base.less
_comit-silvio
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