update .gitignore
Merge branch 'master' of github.com:saada/sails-ember-yeoman-example
Fix file placement