add .idea to git ignore
Merge branch 'master' of https://github.com/GuoshunWu/SymfonyStudy
add .idea to git ignore
update controller
update controller