api stuff
more api stuff
done
hotels added
fixed conflicts