October Final
resolve conflicts

Conflicts:
2014-10.html
fix conflicts