Code organizing
Merge branch 'master' of github.com:Celestibytes/CelestiFarmer