Merge branch 'chris' of https://github.com/rabaut/project1
Added button manager for main menu
Merge remote-tracking branch 'origin/master' into chris
Still has the button error