stl directory renamed to parallel, files modified accordingly
removed thumbs.db files
resolved merge conflicts, added missing includes in count