updating with latest status
Merge branch 'master' of https://github.com/gina-alaska/gina-alaska.github.io

Conflicts:
	_includes/messages.html