remove old file, update exp branch
link to exp branch and added ignore
Merge branch 'master' into exp

* master:
  link to exp branch and added ignore
  remove old file, update exp branch