confirmando cambios
Merge branch 'master' of https://github.com/Edwinpgm/Biralito

Conflicts:
	apps/__init__.pyc
	apps/videos/__init__.pyc
	apps/videos/admin.pyc
	apps/videos/migrations/__init__.pyc
	apps/videos/models.pyc
	apps/videos/urls.pyc
	apps/videos/views.pyc
	biralito/__init__.pyc
	biralito/settings.pyc
	biralito/urls.pyc
	biralito/wsgi.pyc