Primer Commit
Merge branch 'master' of https://github.com/gbelot2003/portal_turistico

Conflicts:
	.gitignore
	LICENSE
	README.md

	modified:   .gitignore
	modified:   LICENSE
	modified:   README.md
	modified:   sites/all/libraries/flexslider (modified content)