Added file in devlopment branch
	C added git ignore emacs backups
Merge branch 'develop'

Conflicts:
	.gitignore