ok almost act ui
merge hapo into dev, act ui
ui is easy...almost finished
ui done to megit add --all go to map
adjust
u1
merged
service_near_finish
user_info
ui
ok map
conflicts solved
update_userinfo
update_userinfo
mmmmmddmd
Merge branch 'alex' of github.com:Haposola/FUTR_Team_Project into alex
user_center_finished
to merge
Merge branch 'alex' of github.com:Haposola/FUTR_Team_Project into alex
merge ok