first commit
Merge https://github.com/Rymdsnigel/chilifarmer