Merge branch 'base'

Conflicts:
	_config.yml
	_layouts/index.html
	_layouts/page.html
	_plugins/navigation_generator.rb
	assets/css/styles.css
	web.config