should be good
Merge branch 'master' of https://github.com/Jazzychen/eecs-dashboard

Conflicts:
	.bundle/config
	app/controllers/viewquotas_controller.rb
	app/controllers/viewquotas_controller.rb~
	app/models/quota.rb
	app/views/viewquotas/change_quota.html.haml
	db/development.sqlite3
	db/migrate/20131105075226_create_usages.rb
	log/development.log
	tmp/pids/server.pid