Pushing code so far
Merge branch 'master' of https://github.com/ollieread/TechnoMagi