Added basic ai
Added basic AI, Fixed merge errors