Don't hide .changes files anymore
Merge branch 'master' of github.com:DamienCassou/emacs.d

Conflicts:
	init.el