Changed from Angular 1.0.8 to 1.1.5, added animations.css file
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity

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

Conflicts:
	public/views/app.html
	public/views/player.html
Merge pull request #31 from silversteez/master

Handling disconnects. A few other things.
Added angular, angular-resource and angular-cookies as cdn, updated bower.json
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity
Merge pull request #32 from davegonzalez/master

Pull Request
Updated questions controller to only return questions with 1 or 2 answers
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity
First pass client-side logic for selecting 2 answers. Server side not implemented yet.
Set up sockets to accept array of picked cards
Updated game controller and service to send array of picked cards
Added support for choosing and judging questions with 2 answers
Updated answers.html to show both answers to a 2-answer question