local changes
local ubuntu config
Merge branch 'master' of http://github.com/cpaulik/emacsconfig
Merge branch 'master' of http://github.com/cpaulik/emacsconfig

Conflicts:
	init.el