Modificari de-ale mele
Merge branch 'master' of https://github.com/dserban/webdev2013fall