Updated MainActivity to randomize shape to buttons with a maximum of 2
per shape type. Consequently updated GameButton and created new Shape class to
keep track of the Shape types.
Updated MainActivity and GameButton classes to support matching functionality.
Merge branch 'master' of https://github.com/xekron/CPS613.git