For merge
Merge branch 'master' of https://github.com/fbocharov/nsu-graphics-lab4

Conflicts:
	src/ru/nsu/fb_and_ez/raycasting/contoller/Controller.java
	src/ru/nsu/fb_and_ez/raycasting/model/WorldMap.java
before merge
Merge branch 'master' of https://github.com/fbocharov/nsu-graphics-lab4

Conflicts:
	src/ru/nsu/fb_and_ez/raycasting/contoller/Controller.java
	src/ru/nsu/fb_and_ez/raycasting/model/Wall.java
	src/ru/nsu/fb_and_ez/raycasting/model/WorldMap.java
	src/ru/nsu/fb_and_ez/raycasting/model/geometry/Plane.java