git rm --cached _theme_packages/the-minimum
git submodule init
git submodule update
Merge remote-tracking branch 'origin/master'

Conflicts:
	_site/atom.xml
	_site/rss.xml
	theme-the-minimum