Added dummy for vcxproj file
Commit to maintaint .suo file
fix more conflict bull shit