Merge pull request #24 from jagub2/master

new semesters: 2014/2015