I'm just learning how git works..
Merge branch 'master' of https://github.com/NoRuBal/netherflame