updating gitignore
Merge branch 'refs/heads/master' into test
adding test of uiowa_bar