Add gitignore
Merge branch 'master' of https://github.com/keexa/emacs_config

Conflicts:
	.gitignore