Flex Slider
Merge branch 'master' of https://github.com/mvendramim/portfolio2

Conflicts:
	portfolio 2.0 mayra/index.html