Nuke it
Merge branch 'master' into dev

Conflicts:
	Gemfile
	Gemfile.lock
	_includes/footer.html
	_includes/header.html
	index.html