tram is required
code folding
Merge branch 'master' of https://github.com/shevchuk/dot-emacs

Conflicts:
	init.el