merging
fixes memory leaks and photo album crashes, fixes inventory view, also resolves merge conflicts, but map view still doesn't work on my end, but don't worry I didn't touch the files so hopefully it will work for you
adding missing file
updating gitIgnore
adding ignoring settings
merging Carolyns changes
merging carolines changes