Merge remote-tracking branch 'upstream/master'

Conflicts:
	guide.t2t
requested before merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	guide.t2t
Fixed worst of bad merge
Fix damage to formatting
Merge pull request #2 from mimosa67/master

Merge changes from mimosa.
Basically change the ratmenu.png.