pagina FIca a dica
Merge branch 'master' of https://github.com/flavioab/bullet

Conflicts:
	temp/static/site/sass/styles.scss
Merge branch 'origin/master'
Merge branch 'origin/master'
merge