Set emacs for proof general
Merge branch 'master' of github.com:nvasilakis/immateriia

Conflicts:
	.emacs