add a controller on the left side
Merge branch 'Dustin'
Merge branch 'master' into Dustin
all the simple gui

all the simple gui
delete useless stuff

delete useless stuff
mistaken revert! revert again
Merge branch 'Dustin'
branch!!!!!!!!!!!

branch!!!!!!!!!!