add test_settings
remove .idea
requirements
adding redirections
home
update models
merge
merge 2
conflicts