Top right side of page's HTML structure - notifications and progress bar - added
added HTML for bottom card landing
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity
Added basic HTML files for bottom card area, notifications/progress bar and right bar
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity
Added factory service for http get requests
Merge pull request #10 from tylermcginnis33/master

Add socket.io room functionality. Each room now takes three users.
Update README.md
Merge pull request #9 from davegonzalez/master

Added basic HTML files/templates
Split up question/answer cards to be handled by different functions
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
data is now passed from controller to view
directive is now generating a random set of cards
Card Controller populates 10 random answer cards, 1 random question card
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity
merging data locally
Removed public/js/config.js file, moved data into app.js file, removed reference from footer.jade