gitignore file
Merge branch 'master' of http://github.com/mozboz/odd-scoperomic
Merge branch 'master' of https://github.com/mozboz/odd-scoperomic into postSubmit