floats ejercicio

template mock-up
Merge branch 'gh-pages'
Merge branch 'master' into gh-pages
floats ejercicio

template mock-up
Merge branch 'gh-pages'