add farm exercise
Merge branch 'master' into tjstankus