first commit
Merge https://github.com/sebnil92/salt