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 pull request #6 from ryuuzakiupldr/master

:)
Merge branch 'master' of https://github.com/dadaoros/socialEngine
prueba 1 con bootstrap
Merge pull request #7 from ryuuzakiupldr/dev

Dev
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~
Merge pull request #8 from ryuuzakiupldr/dev

GUI whith bootstrap
my_profile template added
Merge branch 'master' of https://github.com/dadaoros/socialEngine
changes
recovering lost files
publish-in-wall working
Merge pull request #3 from dadaoros/master

publish in wall
remove f file
name in wall working
som bugs fixed
Merge pull request #9 from ryuuzakiupldr/master

wall