removed engine.lib and engine_glfw.lib from .gitignore
Merge branch 'master' of https://github.com/davidrb/game

Conflicts:
	src/lib/engine_glfwd.lib
	src/lib/engined.lib