Merge pull request #1 from leafo/master

update me
Update 2014.json
Merge pull request #79 from kostasvs/master

Correct date for TAGjam 16