changes
Merge branch 'master' of github.com:mdesanti/SIA-TP2

Conflicts:
	run.m
Merge branch 'master' of github.com:mdesanti/SIA-TP2
moved folders better