basic nhl team info shows up
messing with nhl team stuff
adds roster model
fixes merge conflict with varun
Gemfile.lock chenged, so committing to push
nothing
Merge branch 'master' of github.com:AEgan/MySports-475
in progress