dev
Merge branch 'trainer' of github.com:adrewyew/jikiwi into trainer