a few renames
merge
fix for merge conflict
still trying to fix merge conflict
Merge branch 'master' of https://github.com/JasonCrease/SeeBoard