stash local change before merge
Merge branch 'master' of github.com:nearc/pascal_compiler
add .un~ to .gitignore