switching to sqlite 3 and fixing encoding in seed file
Merge pull request #1 from lavapj/master

switching to sqlite 3 and fixing encoding in seed file
created Winningest page
Created Losingest page
Changed model of white_cards and entries for M2M table.
Created Newest page
adding migration for entries_white_cards
Created awesome pagination
Changed tables to support entries that have more than one blank.
added about page
fixed nav to home page
Merge pull request #34 from fayeishere/master

About Us - Fixes #6
fixed issues and created magic paths
Fixed merge conflicts in entries.css and application.html
Merge branch 'master' of github.com:portlandcodeschool/humanitywar-rails

Conflicts:
	app/assets/stylesheets/entries.css.scss
	app/views/layouts/application.html.haml
Fixed front end to not totally break with new data model.
Removed unneccessary variable
Merge pull request #30 from criskelly/master

Fix for #10 - Winningest page
Merge pull request #35 from wobh/many_white_cards

Fixes #11: Many white cards
fix nesting of white-cards
fix using the wrong instance variable from the controller on small entries