Changed bottom button names
Conflict resolved
Merge pull request #21 from juliooc/master

Changed bottom buttons name