Eval for alan and watts
Resolving conflict
Review for robert and jess
Merge branch 'master' of github.com:turingschool/ruby-submissions
The rest of my notes from today's evaluations