Code documentation
Added vcxproj
Merged conflicts