added subdir.mk to gitignore
Merge branch 'master' of ssh://git@github.com/misomosi/GLvox.git

Conflicts:
	GLvox/Debug/src/subdir.mk