create simple timer class for use in optimization
fix merge conflict
update .vcxproj*