added fallbacks to avg method in group model
got rid of some white space and cleaned up some code
push for mike
this one is just for mike to try out
possibly fixed app breaking bug
final changes before test deploying
Merge branch 'master' into new_generations

loads of conflicts... hopefully this still works.

Conflicts:
	app/assets/stylesheets/application.css
	app/assets/stylesheets/user_courses.css
	app/assets/stylesheets/welcome.css
	app/controllers/groups_controller.rb
	app/models/group.rb
	app/views/groups/show.html.erb
	app/views/parser/index.html.erb
	app/views/students/new.html.erb
	app/views/user_courses/edit.html.erb
	app/views/user_courses/index.html.erb
	app/views/user_courses/new.html.erb
	app/views/welcome/index.html.erb