readme
Merge branch 'Paulina'

Conflicts:
	README.md