fixed conflict

Dockerfile

Makefile

env.example

...oup_size_calc/templates/member_group_size_calc/index.html

member_group_size_calc/urls.py

package.json

requirements/base.txt

requirements/production.txt

rv_voting_calc/__init__.py

rv_voting_calc/admin.py

rv_voting_calc/apps.py

rv_voting_calc/models.py

rv_voting_calc/templates/rv_voting_calc/combined_steps.html

...es/rv_voting_calc/html_steps/found_popularity_winner.html

...alc/templates/rv_voting_calc/html_steps/initial_sort.html

...g_calc/templates/rv_voting_calc/html_steps/no_winner.html

...c/templates/rv_voting_calc/html_steps/removed_option.html

...alc/templates/rv_voting_calc/html_steps/with_support.html

...g_calc/templates/rv_voting_calc/includes/option_list.html

...ing_calc/templates/rv_voting_calc/includes/option_list.md