Added text by Anda
Merge branch 'master' of https://github.com/vladady/Practica

Conflicts:
	sites/all/themes/bootstrap/templates/node.tpl.php
Am adaugat numele meu
Am adaugat numele
Merge branch 'master' of https://github.com/vladady/Practica

Conflicts:
	sites/all/themes/bootstrap/templates/node.tpl.php
Merge branch 'master' of https://github.com/vladady/Practica

Conflicts:
	sites/all/themes/bootstrap/templates/mode.tpl.php
Merge branch 'master' of https://github.com/vladady/Practica

Conflicts:
	sites/all/themes/bootstrap/templates/mode.tpl.php
Merge branch 'master' of https://github.com/vladady/Practica

Conflicts:
	sites/all/themes/bootstrap/templates/node.tpl.php

M-am adaugat si le-am sortat in ordine alfabetica
Merge branch 'master' of https://github.com/vladady/Practica
Merge branch 'master' of https://github.com/vladady/Practica
Merge branch 'master' of https://github.com/vladady/Practica

Conflicts:
	sites/all/themes/bootstrap/templates/node.tpl.php
	sites/all/themes/bootstrap/templates/node.tpl.php.orig

Mi-am adaugat numele
Fixed merge
Merge branch 'master' of https://github.com/vladady/Practica