new commit
basic white board complete
for master branch
Resolved merge conflicts