started on VERY UGLY terminal like code
Merge branch 'master' of github.com:JamesGlanville/GF2