The first commit.

Hopefully everything that's needed is in here.
Merge branch 'master' of https://github.com/szepi1991/Elastaman
I made two repos, one on github, one locally, and I'm trying to unify them.