cuteanrares
Merge pull request #6 from tudoruab/master

Edited README.md
Update README.md
pagina personala
Merge pull request #9 from angelescuuab/master

pagina personala
sonnia
maria
maria
maria
Merge branch 'development' of https://github.com/cipyk/pabd2014

Conflicts:
	web/.htaccess
maria
Merge pull request #10 from cosmamaria/master

Edited README.md
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
sters readme.md