updated gitignore
Merge remote-tracking branch 'origin/development' into 0.0.2