surveys and questions models and controllers
fixed merge error .gitignore