Committed first working version
Removed emacs backup file.
Added .gitignore to ignore emacs backup.
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md