stable version
Merge branch 'julio' into bernardo

Conflicts:
	.gitignore
	fast-cp.py
	globalsVar.py
	main.py