Merge branch 'daniel/code-sample'
diff --git a/app/soc/models/user.py b/app/soc/models/user.py
index b550d05..e45fce7 100644
--- a/app/soc/models/user.py
+++ b/app/soc/models/user.py
@@ -14,6 +14,10 @@
 
 """This module contains the User Model."""
 
+# **************************************************
+# This model is OBSOLETE and should not be used.
+# Please use melange.models.user instead.
+# **************************************************
 
 from google.appengine.api import users
 from google.appengine.ext import db