Merge pull request #36 from moonglum/master

Kiev for HotCode
captainhagbard has been in Athen and Thessaloniki for the EuRuKo 2013
![EuRuKo 2013](http://euruko2013.org/images/euruko2013_logo_408x300-d4ec480c.png)
Merge pull request #37 from timoschilling/master

captainhagbard has been in Athen and Thessaloniki for the EuRuKo 2013