Fixed merge conflict
Merge branch 'master' of github.com:mchaiken/pd1-Snell-sLaw-Chaiken-Piccato-Romanoff

Fixing merge conflics for setName