Changed CSS for buttons, text, h2
fixed conflicts
Merge pull request #9 from mpvazquez/master

fixed merge conflicts