committing to pull
just added some files for git conflicts for user prefs
swithced image path because I was testing to see we had the same image in that location for futurproofing