lsat minute stuff
added tmp to gitignore
fixing silly merge conflict
fixed conflicts