merge project
modify .gitignore file
revert sln changes.
modify projects to vc10