Agregando Rutas
Haciendo Merge

	modified:   app/Resources/views/base.html.twig
	modified:   src/Crystal/NewsBundle/Controller/ViewsController.php
	modified:   src/Crystal/NewsBundle/Controller/usersController.php
	modified:   src/Crystal/NewsBundle/Resources/classes/audio.php
	modified:   src/Crystal/NewsBundle/Resources/config/routing.yml
	modified:   src/Crystal/NewsBundle/Resources/public/css/style.less
	modified:   src/Crystal/NewsBundle/Resources/public/images/favicon.ico
	modified:   src/Crystal/NewsBundle/Resources/public/images/fb.png
	modified:   src/Crystal/NewsBundle/Resources/public/images/pin.png
	new file:   src/Crystal/NewsBundle/Resources/public/images/title.png
	modified:   src/Crystal/NewsBundle/Resources/public/images/twt.png
	modified:   src/Crystal/NewsBundle/Resources/views/Default/index.html.twig
	new file:   src/Crystal/NewsBundle/Resources/views/Default/register.html.twig
Gestion de noticias y categorias faltanado archivos
Mezclando avances

Conflicts:
	src/Crystal/NewsBundle/Resources/public/css/style.less
	src/Crystal/NewsBundle/Resources/views/Default/register.html.twig