added a gitignore and merge local with remote repo

Change-Id: I705959918a94380f27d6dedd3c609f1eaa359d93
make sure the touchpad fix is correct :p

Change-Id: Ib9f1ef0ddfce745dc81351ebdb5ac9aa6e7d19ea