Merge branch 'gh-pages'
scott changes to js and css for flip. Nico changes to map
Merge branch 'master' of github.com:jayperryworks/petting-zoo
equalize js
Merge branch 'gh-pages' of github.com:jayperryworks/petting-zoo into gh-pages

Conflicts:
	_layouts/default.html