afegint funcio matematica
Merge branch 'master' of https://github.com/miscaandrei/projecte_final_daw

Conflicts:
	ikarus_base/ikarus_app/views.py