.gitIgnore
Merge branch 'master' into splash-fade