adding bootstrap
Merge branch 'master' of https://github.com/dadaoros/socialEngine

Conflicts:
	socialApp/migrations/0001_initial.py
	socialApp/migrations/0002_initial.py
Merge branch 'master' of https://github.com/dadaoros/socialEngine
Merge branch 'master' of https://github.com/dadaoros/socialEngine
prueba 1 con bootstrap
my_profile template added
Merge branch 'master' of https://github.com/dadaoros/socialEngine

Conflicts:
	socialApp/models.py~
	socialApp/views.py
	socialEngine/html/base.html
	socialEngine/html/login.html
	socialEngine/settings.py~
my_profile template added
Merge branch 'master' of https://github.com/dadaoros/socialEngine
changes
recovering lost files
publish-in-wall working