updated george
Merge branch 'master' of https://github.com/dfm/bart

Conflicts:
	bart/george.c
updating george again