updated controller/model
Merge remote-tracking branch 'origin/master' into iteration3-2
Merged with latest master, fixed conflicts, fixed a couple bugs
Added instructor field to user
Added migrtion
group_management page
group_management page
group_management pushing again
fixed instructor_controller.rb
finished group_management page
Merged with master
Merged with master again
Merge pull request #47 from TheArchitects/iteration3-2

Jalals part of Iteration 3 2