premerge commit
merged
Merge branch 'master' of https://github.com/bdharris08/cs378-whiteboard