Refactored Wattballs Validation
delete active_admin.css
updated routes.rb
Fixed issue with needing to sign up before accessing participants page
Merge branch 'develop' of github.com:jingar/victory_lies_ahead into admin/staff_hierarchy
Merge branch 'develop' of github.com:jingar/victory_lies_ahead into admin/staff_hierarchy
Auto schedule wattball working
auto schedule wattball working
working auto schedule. Deletes all matches when new schedule created
Merge branch 'develop' of github.com:jingar/victory_lies_ahead into admin/staff_hierarchy
ticketing changes
Merge branch 'develop' of github.com:jingar/victory_lies_ahead into develop
Merge branch 'admin/staff_hierarchy' into develop
deleting local branches
Merge branch 'basic-ticketing' into develop

Conflicts:
	config/routes.rb
Delete public assets - it was making confirm messages come up twice
Changed ticket prices from 10,5 to 5,3
added ticket_type to tickets
migrated heat schedules to admin side
pull conflict resolution