added a gitignore and merge local with remote repo

Change-Id: I705959918a94380f27d6dedd3c609f1eaa359d93