# Added auto copy and linking for glew
Merge remote-tracking branch 'remotes/origin/master' into Batman

* remotes/origin/master:
  #data put temp.bmp texture into the data filter in the main source folder.
  #misc cleaned up project to use proper naming schema.

Conflicts:
	.gitignore
	Ego-Engine/Homework.vcxproj
	Ego-Engine/Homework.vcxproj.filters
Updated git Ignore
Merge branch 'Batman'

* Batman:
  Updated git Ignore
  # Added auto copy and linking for glew