Naing was here.
Merge branch 'master' of https://github.com/theaVision/theaVision

Conflicts:
	test_document.txt