merge conflict fixed
some merge conflicts
Merge branch 'master' of github.com:penabianca/ImagineWare into aime_iteration_3_1
user_update_profile.feature and admin_manages.feature done
Merge branch 'master' of github.com:penabianca/ImagineWare into aime_iteration_3_1
instructor_grade_assignment.feature conflict fixed