change directory
del wierd files
do compare
Merge branch 'slave1' of github.com:vvarma/tr1 into slave1