collaborative drawing working
Merge branch 'master' of https://github.com/sierrakn/247finalproject