Changes
Merge branch 'master' of https://github.com/krasm/emacsrc
Merge branch 'master' of https://github.com/krasm/emacsrc

Conflicts:
	.gitignore
	init.el