kristen’s initial commit
add student view controller edits
commit 3
made some changes
resolved merge conflict