Add
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