Finished context_switch section
Merge branch 'master' of github.com:jtestard/cse221
Fixed merge conflict