I did some stuff. Like make the main menu all pretty and stuff......
Merge remote-tracking branch 'origin/master3'