flatten file structure
Merge branch 'master' of github.com:openlawdc/simple-2

Conflicts:
	convert.py