get all stuff done
Merge https://github.com/wellze92/Roadtripservercode