for master branch
Merge pull request #2 from benk691/dev

Full merge of contributors code
added login
Resolved merge conflicts
Merge pull request #3 from benk691/tmp

Resolved merge conflicts with all branches
Quick commit before working on angular
recommiting
stuuuuf
Seperation of database file in node.js now works.
Added colors, and brush size to the room which is currently index.html
No real update here
Added tooltips to room buttons
app_no_client.js works withoutcredentials.js
Update to nodejs seperation
Merge branch 'master' of github.com:benk691/hackathon into tmp
updating branch
Merge branch 'nodejs' of github.com:benk691/hackathon into tmp
Fully merged changes