(1) raised Eve's hand; (2) renamed some member variables; (3) added more functionality to hand-holding
Merge pull request #177 from Ventrella/master

I made a few minor fixes in Avatar
fixed merge problem
Merge remote-tracking branch 'upstream/master'
Merge pull request #180 from Ventrella/master

fixed merge issue
Merge remote-tracking branch 'upstream/master'
Fixes per code review.