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 branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity
Added margin back to cube.js
Moved initialization out of window scope and into angular module
Merge pull request #19 from davegonzalez/master

Post 8 PM Post Conflict-Merge Pull Request