search/reset button
add to gitignore
merge..