Added Sass as Grunt dependency
Grunt re-compiles Sass files into CSS files on save
Removed unnecessary commented out line
First major restructure. Remove references to articles.
Added .sass-cache folder to .gitignore file
adding .sass-cache/ to gitignore WILL IT WORK THIS TIME?
here we go, this should actually remove it from the repo
Top right side of page's HTML structure - notifications and progress bar - added
Merge pull request #3 from davegonzalez/master

Added SASS to project
added HTML for bottom card landing
Merge pull request #4 from mrngoitall/master

Created REST API for questions and answers
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity
Adding Socket.io infrastructure to project
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity

Conflicts:
	config/routes.js
	package.json
Merge pull request #6 from silversteez/master

Merged Master, Added Socket.IO
Fixed Socket.IO set up, syntax error.
Merge pull request #7 from silversteez/master

Fixed Socket.IO set up, syntax error.
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity
Socket.IO set up, test connection successful.
Merge pull request #8 from silversteez/master

Socket.IO set up, test connection successful.
Added basic HTML files for bottom card area, notifications/progress bar and right bar