2014_2: Week 2
Merge branch 'master' of https://github.com/dseco/acmudec