Merge branch 'master' of https://github.com/citruslee/Studijne-materialy-FIIT
Merge branch 'master' of https://github.com/citruslee/Studijne-materialy-FIIT
AZA: 2014 update
Merge pull request #6 from ok100/master

[Merge] merged aza:2014 update into master