Integrated Larry's Card css
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity
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
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity

Conflicts:
	public/css/common.css
	public/css/common.scss
it's a goddamn cube
Merge pull request #18 from silversteez/master

Server-side game logic working, client-side game service added
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity
Added margin back to cube.js
Add edits to Jade files, create main structure of App.html, add three player directives
Moved initialization out of window scope and into angular module
Merge branch 'master' of https://github.com/tylermcginnis33/cardsforhumanity into tyler-master

Conflicts:
	app/views/layouts/default.jade
	public/js/controllers/index.js
	public/views/index.html
Merge pull request #19 from davegonzalez/master

Post 8 PM Post Conflict-Merge Pull Request
Delete .DS_Store
Player directives, HTML file and app.html file added
Removed .DS_store
Merge pull request #20 from davegonzalez/master

Monday Pull Request
Emitted cards now remove card from players hand
Removing previously committed gitignore file
Removing previously committed gitignore file