Merge pull request #2 from nathanpaul/hackathon

Merge Hackathon Stuffs
Merge pull request #3 from nathanpaul/hackathon

Added 'Add Season' functionality
Merge pull request #4 from JamesRottinger/hackathon

Hackathon
Merge branch 'master' of https://github.com/nathanpaul/FR_office_sports
Merge branch 'master' of https://github.com/JamesRottinger/FR_office_sports
Removed drop seasons
Fixing rake db:migrate
Merge branch 'master' of heroku.com:fr-foosball
Fixed production javascript compiling
Ran rake assets:precompile
Merge branch 'hackathon' of https://github.com/nathanpaul/FR_office_sports
Trying shit
fixing css
Merge branch 'hackathon' of https://github.com/nathanpaul/FR_office_sports
Merge branch 'hackathon' of https://github.com/nathanpaul/FR_office_sports
added tables and logging of partners
Merge pull request #2 from nathanpaul/partner_changes

Partner changes