merge conflict solved
Merge pull request #57 from dhfromkorea/master

fixed the color of the  buttons