cuteanrares
Merge pull request #7 from tudoruab/master

update development
update rep personal inainte de a face pag personala
finalizat creare pagina personala
Merge pull request #8 from tudoruab/master

Added my personal page
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