inclease button size
fixed merge conflicts
Merge pull request #122 from cicadas-2014/jason

change button size
Merge branch 'master' of https://github.com/cicadas-2014/Embark