Added .gitignore
Merge branch 'master' of github.com:jguenther/matlab-emacs

Conflicts:
	.gitignore