my method
Merge branch 'diego'

Conflicts:
	a.c