added .gitignore_global
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore_global
added .emacs.d/after-init.el