sdsdf
afegint imatges
Merge branch 'master' of github.com:miscaandrei/projecte_final_daw

Conflicts:
	ikarus_base/ikarus_app/models.py