Merge pull request #1 from benk691/dev

Updates to files
Bootstrap files and room.html with buttons
stuff
index
room.html updated: added ID's to colors, fixed formatting

closed last div?
Combined all masters
Merge branch 'master' of github.com:benk691/hackathon into tmp
Combination of all collaborators branches (gitignore needs updating)
Finished branch with all contributors code