Update skeleton to have combat frame
Merge branch 'master' of https://github.com/SyntaxBlitz/apcs-2014-final