Updated API to use RoomNumber in Stops table, seperated db credentials so they are not tracked in the repo
Removed extraneous files
Fixed merge conflict