Working on User#show page.
Working on main page styling.
Added budget calculations
Fixed gemfile conflict
Merge branch 'master' of github.com:jbs87/f1fantasyleague