Iniciando front-end
haciendo la bd
Fb feed JS
Informacion para el home terminado
carousel done
codigo compactado unicamente al div
footer
Merge branch 'Nico' of https://github.com/diegoduncan21/Neatics into frontEnd

Conflicts:
	portal/static/css/main.css

	portal/static/index.html
	portal/static/js/main.js

 It looks like you may be committing a merge.
 If this is not correct, please remove the file
	.git/MERGE_HEAD
 and try again.

 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch frontEnd
 Changes to be committed:

	new file:   css/infomacionHome.css
	deleted:    css/main.css
	deleted:    img/bootstrap-mdo-sfmoma-01.jpg
	deleted:    img/bootstrap-mdo-sfmoma-02.jpg
	deleted:    img/bootstrap-mdo-sfmoma-03.jpg
new file:   img/iconoTituloInfo.png
	new file:   img/imgEjemploInfo/info1.jpg
	new file:   img/imgEjemploInfo/info2.jpg
	new file:   img/imgEjemploInfo/info3.jpg
	modified:   index.html
	new file:   infomacionHome.html
	deleted:    js/main.js
	modified:   ../views.py

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	css/home-squares-animation.css
	css/index.css
	img/back-header.png
	img/sprites.png
	js/home-squares-animation.js
	../templates/
Merge branch 'diego' of https://github.com/diegoduncan21/Neatics into frontEnd

Conflicts:
	portal/views.py

 It looks like you may be committing a merge.
 If this is not correct, please remove the file
	.git/MERGE_HEAD
 and try again.

 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch frontEnd
 Changes to be committed:

	modified:   ../models.py
	new file:   ../static/css/footer.css
	new file:   ../static/img/sprites.png
Merge branch 'frontEnd'

 Please enter a commit message to explain why this merge is necessary,
 especially if it merges an updated upstream into a topic branch.

 Lines starting with '#' will be ignored, and an empty message aborts
 the commit.
integrando todo