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