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
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