Add .gitignore and the base for the module
Merge remote-tracking branch 'origin/master' into pull