Merge branch 'dev' of github.com:Haposola/FUTR_Team_Project into alice
Merge branch 'alex' of github.com:Haposola/FUTR_Team_Project into alice
save befor merge
store
small step
ok pull alex
merge alex into dev
ok merge alex
Merge branch 'alex' into dev
alice pull ok
merge alice ok
ite 2 is done
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