change
	Added emacs backups to be ignored, in master.
Merge branch 'master' into develop

Conflicts:
	.gitignore