meh
merge
merge
merge
merge
still working on exams_spec.rb tests
merge conflicts
merge conflicts
merge conflicts