removed the elpa archive contents from tracking
Merge remote-tracking branch 'origin/master'

Conflicts:
	elpa/archives/gnu/archive-contents
Merge remote-tracking branch 'origin/master'
theme changes