added check for tickets left
added route for tickets_left
fixed merge conflicts
Fxed merge conflicts
Fixed parser bomb out
Merge branch 'master' of https://github.com/noahpc/WhiteCollar
Added the bonuses to show up in the student summary report
Added bonuses to show up on the team summary
Moved edit to the left on user's page
Inactivate, deactivate back in dropdown
Merge branch 'master' of https://github.com/noahpc/WhiteCollar
Removed references to Bonuses while we recreate them
total counter now displays again