Merge pull request #41 from tylermcginnis33/master

Add final(I believe) fluid layout until Ipad Mini. Fixed clock sizing.
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity
Merge branch 'master' of https://github.com/davegonzalez/cardsforhumanity