merged files of 2 versions
removed binary files