updating
Merge branch 'master' of https://github.com/bcollazo/syllabus-eater

Conflicts:
	script/2textconv/2txtconvert.py
updating