Idk what was changed but I guess I have to commit here
Idk what this file is, but I have to commit it I guess.
Merge branch 'master' of https://github.com/noahdietz/MyVizardExtension

Conflicts:
	vizExt2.sdf
	vizExt2.v12.suo