fixed some problems (merge)
add .gitignore