changed
Merge branch 'master' of https://github.com/WuPei/IN2057_TUM

Conflicts:
	Exercise 2/Main.m
Exercise 2/draw_points.m
Merge branch 'master' of https://github.com/WuPei/IN2057_TUM

Conflicts:
	Exercise 2/Main.m

	modified:   .DS_Store
	deleted:    Exercise 2/Main.m
	modified:   Exercise 2/draw_ideal.m
	new file:   Exercise 2/draw_image_plane.m
	new file:   Exercise 2/draw_image_plane.m~
	new file:   Exercise 2/draw_infinity_intersection.m
	new file:   Exercise 2/draw_infinity_intersection.m~
	modified:   Exercise 2/draw_lines.m
	new file:   Exercise 3/exercise3_4.m
	new file:   Exercise 3/exercise3_5.m
	new file:   Exercise 3/mydlt.m
	new file:   Exercise 3/mydlt_norm.m
	new file:   Exercise 4/exercise4_4.m
	new file:   Exercise 4/robust_matching.m
	new file:   Exercise 4/robust_matching_adaptive.m
	modified:   Exercise 5/.DS_Store
	renamed:    Exercise 5/exercise3_a.m -> Exercise 5/exercise5_3.m
For pulling
merged