did as mush as possible with time given
trying to fix this merge issue
Merge branch 'master' of https://github.com/wmateer/Animawl-Brawl