Add merge functionality.
Add ediff functionality.
Duplicate line
Add method to sort words alphabetically.
Moving wrongly located code block.
Add line numbering support.
Merge branch 'master' into dev.coding

Conflicts:
	config/install.el
Remove tabs.
Merge pull request #8 from mvdakker/dev.coding

Add basic coding functionality