Basic CD

Ready to implement fighting
Test?
Merge remote-tracking branch 'origin/master'