HQScreams
conflict resolved
Merge branch 'master' of github.com:ryancheu/Battle2013Team0