removed old vcproj file
extra-special merging function, with bells AND whistles
added merge algorithm