message
ss
images
Merge branch 'master' of https://github.com/miscaandrei/projecte_final_daw

Conflicts:
	ikarus_base/ikarus_app/models.pyc
	ikarus_base/ikarus_app/models_admin.pyc
	ikarus_base/ikarus_app/views.pyc
	ikarus_base/ikarus_base/settings.py
	ikarus_base/ikarus_base/settings.pyc
	ikarus_base/ikarus_base/urls.pyc
Merge branch 'master' of https://github.com/miscaandrei/projecte_final_daw
arreglant conflictes de versions
Conflicts:
	ikarus_base/ikarus_app/views.py
	ikarus_base/ikarus_app/views.pyc
Agregant css...
Merge branch 'master' of https://github.com/miscaandrei/projecte_final_daw
   petita mod