removing unused methods for projects+ students+routes
merged with latest master
had forgotten a merge conflict
Merge pull request #81 from TheArchitects/k1/rise_the_coverage

K1/rise the coverage
Fixing group merge bug
fixed group dashboard bug which would break if user doesnt have a group
fixed a bug, params[:feedback]
fixed a bug, reader breaks if there is a group with out a reader
almost complete seed
Fixed formatting and minor issues in projects/index
Merge pull request #77 from TheArchitects/project_match

Project match
Merge branch 'master' into last_fixes

Conflicts:
	db/seeds.rb
Merge branch 'master' of http://github.com/TheArchitects/Spillio into fixes_project_list
making badges colorful
fix for redirecting to user profile after login
removing un nesasary assets from mygroups
Merge pull request #84 from TheArchitects/fixes_project_list

Fixes project list
Merge pull request #83 from TheArchitects/last_fixes

Last fixes
Merge pull request #85 from TheArchitects/colorful_badges

Colorful badges
Merge branch 'master' of github.com:TheArchitects/Spillio into project_match

Conflicts:
	db/seeds.rb