Created the floats exercise and matched the proper divs to the example
Updated the index so that it matches the accidental push to the gh branch
Merge branch 'master' into gh-pages

Conflicts:
	angryGandalf.html