Merge branch 'develop'

Conflicts: .gitignore README.md
Dreadbot · Jan 5, 2016 · 37a037b · 37a037b
2 parents aa374a7 + 662b940
commit 37a037b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/ADBLib.h b/src/ADBLib.h
@@ -2,9 +2,9 @@
 #include <WPILib.h>
 
 //AI
-#include "FiniteStateMachine.h"
-#include "FSMState.h"
-#include "FSMTransition.h"
+#include "ai/FiniteStateMachine.h"
+#include "ai/FSMState.h"
+#include "ai/FSMTransition.h"
 
 //Drivebase
 #include "drivebase/Drivebase.h"