(*)  Update readme
Merge remote-tracking branch 'pieter/master'
(*) Initialise git by default
(*) Update gitignore template
Merge pull request #6 from Orcomp/master

Merge