created the branding
updated the .gitignore
fixed conflicts
Merge branch 'master' of github.com:WP-Brasil/tema