Merge pull request #19 from SpyMaster356/master

bringing Wiggins up to date
fixed syntax errors
Merge branch 'local' into GUI