Esword update
Dual Eswords Now Deflect Shots
Stop, HAMMER TIME!
Syni Venors
Admin Room/Syndi Shuttle update
Bulldog In-Hand Fix
Revert "Admin Room/Syndi Shuttle update - Merge Conflict Fix"

This reverts commit 86416d7fb3124cc845dd906e50feb9f35d0756a0.
Map Changes, Attempt #2
Map Changes, Merge Conflict Fix? I hope?
Revert "Map Changes, Merge Conflict Fix? I hope?"

This reverts commit a2a4ace9f893b51108f941f0df04ef1b1ed8a871.
Revert "Map Changes, Attempt #2"

This reverts commit 5801818e95cd3b0a45bd727cd55526c0a9c16691.
Merge pull request #2 from ZomgPonies/master

Merge pull request #499 from Markolie/master
Debugging
Merge pull request #503 from Markolie/master

Debugging for crashing
Revert debugging
Merge pull request #504 from Markolie/master

Revert debugging
Merge pull request #500 from SamCroswell/master

Updates
Merge pull request #4 from ZomgPonies/master

Upstream merge