.
Merge branch 'master' of https://github.com/sanderbongers/levelloop

Conflicts:
log/development.log
tmp/pids/server.pid
.