conflict fix
Merge branch 'master' of https://github.com/Huii/cg1213rc

Conflicts:
	Brausch_Schaefer_rt/src/techniques/perlinNoise.h