lots of code . . . (later)
added more stuff to feeder
fixed my derp
Merge branch 'master' of git://github.com/swarage/612-2013 into swaraj
Merge branch 'swaraj'

Conflicts:
	joysmooth.cpp
	joysmooth.h