tmp commit
foo
resolve merge conflicts
resolve merge conflicts
resolve merge conflicts
Merge branch 'integration' of github.com:nens/lizard-client into integration
Merge branch 'integration' of github.com:nens/lizard-client into integration
Modified CSS to prevent firefux fucking up styling
Merge pull request #57 from nens/dirk_fix_firefox_CSS_for_cards

Dirk fix firefox css for cards