Still testing branching
Added the emacs backup files to the ignore file
Let's see if I understood the basics of branching...

Conflicts:
	.gitignore
	README