Adding Halloween Date
Fixing merge conflict