parker added name to fart.cpp
fixed unmerged fart
Merge branch 'parker'
testing
added my name