prepare merging
add dist to gitignore