this is a test
delete123
Merge branch 'dev' of https://github.com/Haposola/FUTR_Team_Project into alex
a foolish commit, new a lot of models
modified activity UI
ask questions about a activity
v1.0
activity show finished, with Q&A, and comment
Merge branch 'activity' into hapo
small fault accurated
actTag model new
v1.1
temply, stop here, just a default tag image
conflict merged
v1.2
small modify
merge alex to hapo
Merge branch 'alex' to local
mist
Merge branch 'alex', again, small changes