.
pre merge
merge fix
.
Merge pull request #9 from wendinglu/drawingboard

Drawingboard
modified drawing.js and family.js so that database works; collaborative drawing works; fixed stream page for new database schema
Sessions working. Users can now log in and create a new account
changed session to store user object instead of name
.
Merge pull request #10 from wendinglu/login

Login, user creation, and session
added thte ability to request a drawing
fixed merge conflicts from pull
tried to implement adding of family members.. and is not working..