mean
Merge branch 'master' of https://github.com/sagieske/CV1_project

Conflicts:
	testing.m
Merge branch 'master' of https://github.com/sagieske/CV1_project
working on sorting