Conflict resolution
Merge branch 'master' of https://github.com/Tundra-Python/AppetEYES
Final integrations Step 1
Integrating getting and setting liked pictures and user preferences
Saving liked and disliked images now work
resolved conflicts
Changed response to likes to be an object
User Prefs now working
Resolved conflicts
Resolved more conflicts
Resolving more conflicts
Merge branch 'master' of https://github.com/Tundra-Python/AppetEYES
User prefs now work without conflicts
Same commit as before