Hopefully fixing the avatar bug.

.gitignore

@@ -4,3 +4,4 @@ composer.phar
 composer.lock
 .DS_Store
 /app/config/app.php
+/public/img/avatars/*

app/models/User.php

@@ -69,7 +69,7 @@ class User extends Eloquent implements UserInterface, RemindableInterface {
 
     public function setSetting($key, $value) {
         $settings = json_decode($this->settings);
-        if(!is_null($settings)) {
+        if(is_null($settings)) {
             $settings = array();
         }
         $settings[$key] = $value;