navbar
Fix merge conflict in test.foo
 conflict
index project
stash
merge
pull fontawesome
conflict
max width and center
index projects
index project
fixed navbar
merge'
'
small fix design
fix modal
user favorites view
modal
merge
Merge branch 'master' of github.com:PUC-IIC2513/T1

Conflicts:
	Entrega 2/log/development.log
	Entrega 2/tmp/pids/server.pid
Merge branch 'master' of github.com:PUC-IIC2513/T1

Conflicts:
	Entrega 2/log/development.log