test
beginning to update counselor field
merges master and development logs
final changes
fixes merge conflicts
Merge pull request #13 from case-eee/student-action

Student action