message: Removes merge conflict junk
diff: This contains details on the alpha and beta build assemblies, including parts information and assembly instructions.
  * [Alpha Build Instructions](Alpha_Build_Instructions)
  -<<<<<<< HEAD
  -* [Beta Build Instructions](Beta_Build_Instructions)
  -=======
  * [Beta Build Plan](Beta_Build_Instructions)
  