Fixed Address Information, Added Scripts
Merge branch 'master' into gh-pages

Conflicts:
	_config.yml
	_includes/header.html