areglant fallos del server amb els settings
Merge branch 'master' of https://github.com/miscaandrei/projecte_final_daw
Merge branch 'master' of https://github.com/miscaandrei/projecte_final_daw

Conflicts:
	ikarus_base/ikarus_app/models.pyc
	ikarus_base/ikarus_app/views.pyc
	ikarus_base/ikarus_base/urls.pyc
3d funcionant