merging back in
Merge branch 'master' of github.com:ivygulch/LastLawyerStanding
merging back in