added my name
Merge branch 'master' into jvronsky

Conflicts:
	fart.cpp
testing