Added new button types: square, rewind and fast forward
Updated README.md
Merge Pull Requests and resolve conflicts
Updated README.md
Merge pull request #22 from juanjocorbalan/master

New button types