what
Merge branch 'master' of github.com:HumblePaper/FileFormatConversion

Conflicts:
	celeryworker/tasks.py
	tests/tests.py
Merge branch 'master' of github.com:HumblePaper/FileFormatConversion