Refine items listed in list.html.erb; look for 'todo @mjy'
Merge remote-tracking branch 'origin/master'