untrack *.suo file
Merge opposing code bases, and got rid of erranously commited binaries.