Pre-merge
Merge branch 'master' of https://github.com/impiaaa/ludum-dare-30