cuteanrares
Merge pull request #6 from tudoruab/master

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