edited lan 2
Merge remote-tracking branch 'origin/t@lu' into t@lu

Conflicts:
	talu/test.txt