Should be final layout commit. Works on just about everything down to a Ipad Mini
Merge pull request #40 from silversteez/master

Assigning player's color indices that don't change once the game has beg...
Fix timer size
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity
added ng-if statement and animation to notifications
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity
Merge pull request #41 from tylermcginnis33/master

Add final(I believe) fluid layout until Ipad Mini. Fixed clock sizing.
changed 'socket.id' to player.username for socket emit
added id/style to notifications
added ng-cloak to answers view, should fix the doubling card issue
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity
Add info to timer
Merge pull request #2 from tylermcginnis33/master

Add info to timer.
Merge branch 'master' of https://github.com/davegonzalez/cardsforhumanity
Add final timer status'
Merge pull request #3 from tylermcginnis33/master

Add final timer status'
Merging Tyler's branch
Merge pull request #42 from davegonzalez/master

Mid-day pull request
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity

Conflicts:
	config/socket/socket.js