merge dev into master, ite3, v0.1
ftry
map all finished git add --allgit add --allgit add --allgit add --all
try to fix bugs
precompile is done
correct
ok
prcom
Merge branch 'alex' of github.com:Haposola/FUTR_Team_Project into alex
aa
merge
merge alice
merge alice , shit