ignore update and lib update (should jsut remove opencv dependency...) -sG
removed opencv dependency -sG
working state pre timeline surgery -sG
Merge branch 'master' into timeline_port

Conflicts:
	vc2012/HodginDidIt.vcxproj