yeah yeah yeah
Merge branch 'master' of https://github.com/fhacktory/BlenderBQ
Merge branch 'master' of https://github.com/fhacktory/BlenderBQ
..
Merge branch 'master' of https://github.com/fhacktory/BlenderBQ
Merge branch 'master' of https://github.com/fhacktory/BlenderBQ

Conflicts:
	blender.py
	config.py