Ignore Sublime Project file
Merge branch 'master' into display