updates
updates
Merge branch 'gh-pages' of https://github.com/laurenstill/TeamFloriduh into gh-pages

Conflicts:
	_layouts/base.html