Issue #22
Fixed again
Merge branch 'master' of https://github.com/destiny14/toytanfall
Merge branch 'master' of https://github.com/destiny14/toytanfall
Merge branch 'master' of https://github.com/destiny14/toytanfall
Merge branch 'master' of https://github.com/destiny14/toytanfall
Merge branch 'master' of https://github.com/destiny14/toytanfall
Merge branch 'master' of https://github.com/destiny14/toytanfall
Merge branch 'master' of https://github.com/destiny14/toytanfall
Merge branch 'master' of https://github.com/destiny14/toytanfall
...