pulled new changes
Merge branch 'backgrounds'
pulled most recent changes
removed phonecat file
fixed merge conflict