updated basic files
Merge branch 'master' of https://github.com/matiparv/ntd2013-workshop-template