Improved user password encryption to use bcrypt instead of SHA1.
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity
Updated package.json to include bcrypt module
Can now add and remove players from multiple states
Merge pull request #11 from mrngoitall/master

Updated user password encryption method to bcrypt for improved security
Merge pull request #12 from davegonzalez/master

Pre-8:00 PM pull
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity
Merge pull request #13 from silversteez/master

3 person rooms implemented. Starts games on 3 players in room, Dissolves game when player leaves.
Integrated Larry's Card css
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity
Omitting _id on REST API for questions and answers to save space.
Just our usual commit every ten lines. Remove articles.css, add main structure of index.html, add some css on index.html
More work on the main HTML/CSS. Card Logo, and structure of upper half HTML
Basic HTML/CSS done. Now, time for fun
Merge pull request #14 from mrngoitall/master

Omitted _id on REST API for questions and answers to save space. Added 'official' flag to Mongoose schema.
Merge pull request #15 from tylermcginnis33/master

Html/CSS stuff
Add sections on different pages of html + arrows
Merge pull request #16 from tylermcginnis33/master

Add sections on different pages of html + arrows
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity

Conflicts:
	public/css/common.css
	public/css/common.scss
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity

Conflicts:
	public/css/common.css
	public/css/common.scss
	server.js