Merge branch 'minimizebutton'
[ghostsoverboard] / welcome