working on locations
tinkering with parameters
added local settings to gitignore
merge conflicts between branches