removed broken merge
Merge branch 'master' of https://github.com/gintas/as24hack