new commit
basic white board complete
for master branch
Resolved merge conflicts
Merge pull request #3 from benk691/tmp

Resolved merge conflicts with all branches