More work on the Main Menu.
Fixed a syntax error.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Button class creation.
Merge remote-tracking branch 'upstream/master'
Added menu/button stuff