Merge branch 'Dustin'
Merge branch 'master' into Dustin
all the simple gui

all the simple gui