Ignore the Teaser files.
Merge branch 'origin/master'