Merge remote-tracking branch 'upstream/master'
GUI Changes

+Added the main menu.
+Added images for buttons instead of text.

BUGS:
Timer doesn't work anymore

TODO:
Pretty up the remaining buttons and the front page. Then all done this
end.
Merge from Sam
Merge from Sam