update
Merge branch 'master' of https://github.com/dimosarts/2014-autumn-informatics