Added perlin noise for terrain. (only one square of static terrain generated right now)
Merge branch 'master' of https://github.com/marouen-lamiri/COMP371-Project

Conflicts:
	GLM/Source.cpp