Added a color scheme: wombat and a package: magit
Merge branch 'master' of https://github.com/kawatab/dotfiles

Conflicts:
	init.el