created Winningest page
Created Losingest page
Created Newest page
Created awesome pagination
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
fix using the wrong instance variable from the controller on small entries
added whitecard specs and fixed other specs
Merge pull request #36 from Phil0xF7/master

Added whitecard spec and fixed other specs
Merge branch 'master' of github.com:portlandcodeschool/humanitywar-rails into newentry

Conflicts:
	app/controllers/entries_controller.rb
	app/models/entry.rb
	app/views/entries/index.html.haml
	app/views/layouts/application.html.haml
	config/routes.rb
	spec/models/entry_spec.rb