diff --git a/.gitignore b/.gitignore
index b56b83e..1198011 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ local_settings.py
 .DS_Store
 /datos
 static_media/files/uploads/*
+.ropeproject
diff --git a/notas/models.py b/notas/models.py
index 736abdc..c7e6ebe 100644
--- a/notas/models.py
+++ b/notas/models.py
@@ -38,4 +38,4 @@ def adjunto(self):
         return adjunto
 
     def get_absolute_url(self):
-    	return '/notas/%d/' % (self.id,)
\ No newline at end of file
+    	return '/notas/%d/' % (self.id,)
diff --git a/notas/views.py b/notas/views.py
index f3efe09..8386318 100644
--- a/notas/views.py
+++ b/notas/views.py
@@ -33,25 +33,27 @@ def index(request):
 
 @login_required
 def crear_nota(request):
+    
+    NotaFormset = generic_inlineformset_factory(Imagen, extra=2)
+    
     if request.method == 'POST':
         form = NotasForms(request.POST)
-        NotaFormset = generic_inlineformset_factory(Imagen, extra=5)
-        nota = Notas.objects.get(form.id)
-        formset = NotaFormset(instance=nota, data=request.POST)
+        formset = NotaFormset(request.POST, request.FILES)
+    	if form.is_valid() and formset.is_valid():
+            form_uncommited = form.save(commit=False)
+            form_uncommited.user = request.user
+            form_uncommited.save()
 
-    	if formset.is_valid():
+            formset = NotaFormset(request.POST) 
+            #formset_uncommited = formset.save(commit=False)
+            #formset_uncommited.content_object = form_uncommited
+            #formset_uncommited.save()
             formset.save()
-            #form_uncommited = form.save(commit=False)
-            #form_uncommited.user = request.user
-            #form_uncommited.save()
-
-            
-
             return HttpResponseRedirect('/notas')
     else:
         form = NotasForms()
-        form1 = FotoForm()
-        form2 = AdjuntoForm()
+        formset = NotaFormset()
+
     return render_to_response('notas/crear_nota.html', locals(),
     	                         context_instance=RequestContext(request))
 
diff --git a/templates/notas/crear_nota.html b/templates/notas/crear_nota.html
index 93f2840..10eebda 100644
--- a/templates/notas/crear_nota.html
+++ b/templates/notas/crear_nota.html
@@ -4,9 +4,8 @@
 	<form enctype="multipart/form-data" action="." method="post" accept-charset="utf-8">{% csrf_token %}
 		{{form.as_p}}
 		<h6>Agregar imagenes</h6>
-		{{form1.as_p}}
-		<h6>Agregar documentos</h6>
-		{{form2.as_p}}
+		{{ formset.management_form }}
+		{{formset.as_p}}
 		<input id="boton-preguntar" type="submit" value="Guardar">
 	</form>
 {% endblock %}
\ No newline at end of file