Uppdated gitignore to ignore emascs temp files.
Merge branch 'master' into chapter3