.
pyc
Merge branch 'master' of https://github.com/sveinou/DF

Conflicts:
	conf.pyc