adding touch.txt in 2nd view
merging master back into second view