sonnia
sonia
--
Merge branch 'development' of https://github.com/UAB2014/pabd2014

Conflicts:
	README.md
sonnia
sonnia
de la Sonia
Merge pull request #20 from sonnia/master

Sonia test