MOAR AI
Merge remote-tracking branch 'origin/master'
AI is actually competent!