big file
Merge branch 'master' of github.com:hendecasyllabic/cuneiform

Conflicts:
	perl/CHUNKER/getcorpus.pm
Merge branch 'master' of github.com:hendecasyllabic/cuneiform
Merge branch 'master' of github.com:hendecasyllabic/cuneiform
Merge branch 'master' of github.com:hendecasyllabic/cuneiform
Merge branch 'master' of github.com:hendecasyllabic/cuneiform
merge stuff
Merge branch 'master' of github.com:hendecasyllabic/cuneiform

Conflicts:
	perl/CHUNKER/getcorpus.pm