Removing unresolved conflict files
Merge pull request #243 from VirtualFlyBrain/Sandbox-Server

Removing unresolved conflict files