added constructor and cpp for drawable. Changed combat to extend drawable
merging branches still... not working well... urrrgghhh