fixed faulty looping crashing the server
Merge pull request #82 from photonerddan/server_crash_error

fixed faulty looping crashing the server
Merge remote-tracking branch 'origin/master' into frontend_dev