updated gitignore to overlook temp files
merge resolution