created first test
Merge branch 'master' of https://github.com/JAthertonKent/RingOfFire
created first test