set initial data name
Merge branch 'master' of https://github.com/M1812M/Inf-PP.git
tidy up controller