touch event slightly modified
added gitignore
merged