Renamed README.md to README.org to fix formatting.
Merge branch 'master' of github.com:larstvei/dot-emacs

Conflicts:
	README.org