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
change
small step
ok pull alex
merge alex into dev
add_comment_star
correct_knows
correct_knows
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