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

all the simple gui
delete useless stuff

delete useless stuff
Merge pull request #3 from DUKaige/Dustin

Dustin merge