Initializing of terrain
Merge branch 'master' of https://github.com/Svetlin-Slavchev/OOP-teamwork

Conflicts:
	version 1.1/version 1.1.csproj