no .log and .pgp files
merge resolution?
hack to get me a gitignore