set margin
Merge branch 'master' of github.com:spinos/aphid

Conflicts:
	caterpillar/Ground.cpp