diff --git a/.gitignore b/.gitignore
index 85d846b982..8e9075ba49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@ nsh_romfsimg.h
 cscope.out
 .configX-e
 nuttx-export.zip
+.~lock.*
 dot.gdbinit
 mavlink/include/mavlink/v0.9/
 .*.swp
diff --git a/Documentation/arming_state_machine.odg b/Documentation/arming_state_machine.odg
new file mode 100644
index 0000000000..cfadbab7c9
Binary files /dev/null and b/Documentation/arming_state_machine.odg differ
diff --git a/Documentation/arming_state_machine.pdf b/Documentation/arming_state_machine.pdf
new file mode 100644
index 0000000000..2c3e8be234
Binary files /dev/null and b/Documentation/arming_state_machine.pdf differ
diff --git a/Documentation/flight_mode_state_machine.odg b/Documentation/flight_mode_state_machine.odg
new file mode 100644
index 0000000000..b630ecb402
Binary files /dev/null and b/Documentation/flight_mode_state_machine.odg differ
diff --git a/Documentation/flight_mode_state_machine.pdf b/Documentation/flight_mode_state_machine.pdf
new file mode 100644
index 0000000000..cd234ada73
Binary files /dev/null and b/Documentation/flight_mode_state_machine.pdf differ
diff --git a/Documentation/rc_mode_switch.odg b/Documentation/rc_mode_switch.odg
new file mode 100644
index 0000000000..e35a83372b
Binary files /dev/null and b/Documentation/rc_mode_switch.odg differ
diff --git a/Documentation/rc_mode_switch.pdf b/Documentation/rc_mode_switch.pdf
new file mode 100644
index 0000000000..823b1d8684
Binary files /dev/null and b/Documentation/rc_mode_switch.pdf differ