changed shaders to version 1.20, GL to version 2.1
Merge branch 'height-map' into opengl-2.1

Conflicts:
	shaders/Texture2D.vert
works on mac
day night separated
merging
 fixed makefile to use pkg-config for imagemagick
fuck if I know
Merge branch 'opengl-2.1'
Merge branch 'opengl-2.1'