Combat engine

Combat Engine is now completet and is ready for merging.