Adding .gitignore
Merge branch 'master' into alpha-02