wip, changed button color
Merge branch 'master' of https://github.com/dasilvacontin/dasilvacontin.github.i