THE TWO REPORTS WORK YEAAAHHHH
REPORTS ARE WORKING, NOW WITH COLUMN TOTALS, AND BOTH REPOrts. ALSO fixed some nomenclature bugs i did
added gemfile.lock
removed gemfile.lock - lacked therubyracer gem
adding gemfile.lock master
removed puts statements
removed rest of put statements
re-precompiled assets, hopefully css will update
Merge branch 'master' of https://github.com/lewisren/FuelEd
fixed some query problems, admin redirect logic
Merge branch 'davidbranch' of https://github.com/lewisren/FuelEd into davidbranch

Conflicts:
	app/models/appointment.rb