new commit
random update
room.html updated: added ID's to colors, fixed formatting

closed last div?
Stuff
DB schemas for the user and room (tmp scheamas)
Update to insertions of DB
More updating database nothing really got done here
Combined all masters
Merge branch 'master' of github.com:benk691/hackathon into tmp
Combination of all collaborators branches (gitignore needs updating)
Update to gitignore
Finished branch with all contributors code
basic white board complete
for master branch
Updated for stuff
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