tafu2
Merge git://github.com/Pachara/thepachara

Conflicts:
	123.docx