Add .gitignore in addition to .gitignore_global
Add standard ignore file for git
Merge branch 'add-gitignore' of github.com:eyadsibai/mackup into eyadsibai-add-gitignore

Conflicts:
	CHANGELOG.md
Merge branch 'eyadsibai-add-gitignore'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	CHANGELOG.md