update
Merge branch 'master' of https://github.com/mclayton7/PathLossOpenGL

Conflicts:
	pathlossGL
	pathlossGL.o