change link Xij to XL
Merge branch 'obj'
Merge branch 'master' into obj

Conflicts:
	hw1.c