Added buttons
Resolve controllerController conflicts
Stub out grid lines
Merge branch 'master' into controls
Fix merge conflicts
Fix git dumbness
add basic panel
Merge branch 'controls'