Yup YAML.
Merge branch 'master' of
https://github.com/richbs/django-record-collector.git

Conflicts:
	wercker.yml