Optimised slightly. Separated parameters for easier 'hotkeying'. Added function(s) so Enter key triggers re-generation of terrain
Merge branch 'master' of https://github.com/BouncingCzech/MAG_assignment2

Conflicts:
	GameApp.cpp
	Noise.cpp
	Terrain.h