added '*~' to gitignore