Refactored and awesome
Merge branch 'master' of github.com:ollieread/TechnoMagi
Refactored and awesome