# Conflicts:
#	.gitignore
#	app/competitions/tests.py
#	app/context_processors.py
#	app/fabfile.py
#	app/profiles/views.py
#	app/registration/__init__.py
#	app/registration/admin.py
#	app/registration/apps.py
#	app/registration/auth_urls.py
#	app/registration/backends/__init__.py
#	app/registration/backends/default/__init__.py
#	app/registration/backends/default/urls.py
#	app/registration/backends/simple/__init__.py
#	app/registration/backends/simple/urls.py
#	app/registration/forms.py
#	app/registration/locale/ar/LC_MESSAGES/django.mo
#	app/registration/locale/ar/LC_MESSAGES/django.po
#	app/registration/locale/bg/LC_MESSAGES/django.mo
#	app/registration/locale/bg/LC_MESSAGES/django.po
#	app/registration/locale/da/LC_MESSAGES/django.mo
#	app/registration/locale/da/LC_MESSAGES/django.po
#	app/registration/locale/de/LC_MESSAGES/django.mo
#	app/registration/locale/de/LC_MESSAGES/django.po
#	app/registration/locale/el/LC_MESSAGES/django.mo
#	app/registration/locale/el/LC_MESSAGES/django.po
#	app/registration/locale/en/LC_MESSAGES/django.mo
#	app/registration/locale/en/LC_MESSAGES/django.po
#	app/registration/locale/es/LC_MESSAGES/django.mo
#	app/registration/locale/es/LC_MESSAGES/django.po
#	app/registration/locale/es_AR/LC_MESSAGES/django.mo
#	app/registration/locale/es_AR/LC_MESSAGES/django.po
#	app/registration/locale/fr/LC_MESSAGES/django.mo
#	app/registration/locale/fr/LC_MESSAGES/django.po
#	app/registration/locale/he/LC_MESSAGES/django.mo
#	app/registration/locale/he/LC_MESSAGES/django.po
#	app/registration/locale/is/LC_MESSAGES/django.mo
#	app/registration/locale/is/LC_MESSAGES/django.po
#	app/registration/locale/it/LC_MESSAGES/django.mo
#	app/registration/locale/it/LC_MESSAGES/django.po
#	app/registration/locale/ja/LC_MESSAGES/django.mo
#	app/registration/locale/ja/LC_MESSAGES/django.po
#	app/registration/locale/ko/LC_MESSAGES/django.mo
#	app/registration/locale/ko/LC_MESSAGES/django.po
#	app/registration/locale/nl/LC_MESSAGES/django.mo
#	app/registration/locale/nl/LC_MESSAGES/django.po
#	app/registration/locale/pl/LC_MESSAGES/django.mo
#	app/registration/locale/pl/LC_MESSAGES/django.po
#	app/registration/locale/pt_BR/LC_MESSAGES/django.mo
#	app/registration/locale/pt_BR/LC_MESSAGES/django.po
#	app/registration/locale/ru/LC_MESSAGES/django.mo
#	app/registration/locale/ru/LC_MESSAGES/django.po
#	app/registration/locale/sl/LC_MESSAGES/django.mo
#	app/registration/locale/sl/LC_MESSAGES/django.po
#	app/registration/locale/sr/LC_MESSAGES/django.mo
#	app/registration/locale/sr/LC_MESSAGES/django.po
#	app/registration/locale/sv/LC_MESSAGES/django.mo
#	app/registration/locale/sv/LC_MESSAGES/django.po
#	app/registration/locale/zh_CN/LC_MESSAGES/django.mo
#	app/registration/locale/zh_CN/LC_MESSAGES/django.po
#	app/registration/locale/zh_TW/LC_MESSAGES/django.mo
#	app/registration/locale/zh_TW/LC_MESSAGES/django.po
#	app/registration/management/commands/cleanupregistration.py
#	app/registration/migrations/0001_initial.py
#	app/registration/models.py
#	app/registration/signals.py
#	app/registration/tests/__init__.py
#	app/registration/tests/backends.py
#	app/registration/tests/forms.py
#	app/registration/tests/models.py
#	app/registration/tests/urls.py
#	app/registration/tests/views.py
#	app/registration/urls.py
#	app/registration/views.py
#	app/settings.py
#	app/templates/auth/logged_out.html
#	app/templates/auth/login.html
#	app/templates/auth/password_change_done.html
#	app/templates/auth/password_change_form.html
#	app/templates/auth/password_reset_complete.html
#	app/templates/auth/password_reset_confirm.html
#	app/templates/auth/password_reset_done.html
#	app/templates/auth/password_reset_form.html
#	app/templates/profiles/create_profile.html
#	app/templates/profiles/edit_profile.html
#	app/templates/profiles/profile_detail.html
#	app/templates/registration/composers/registration_form.html
#	app/templates/registration/jury/registration_form.html
#	app/urls.py
#	app/utils.py
#	app/version.py
#	app/web/fixtures/sample-doc.pdf
#	app/web/fixtures/sample-score.pdf
#	app/web/tests.py
#	community/apps.py
#	context_processors.py
#	fabfile.py
#	registration/apps.py
#	requirements.txt
#	templates/auth/logged_out.html
#	templates/auth/password_change_done.html
#	templates/auth/password_change_form.html
#	templates/auth/password_reset_complete.html
#	templates/auth/password_reset_confirm.html
#	templates/auth/password_reset_done.html
#	templates/auth/password_reset_form.html
#	templates/registration/logged_out.html
#	templates/registration/password_change_done.html
#	templates/registration/password_change_form.html
#	templates/registration/password_reset_complete.html
#	templates/registration/password_reset_confirm.html
#	templates/registration/password_reset_done.html
#	templates/registration/password_reset_form.html
#	ulysses/context_processors.py
#	ulysses/fabfile.py
#	ulysses/utils.py
#	utils.py
#	web/fixtures/sample-doc.pdf
#	web/fixtures/sample-score.pdf
#	web/tests.py
#	web/tests/fixtures/sample-doc.pdf
#	web/tests/fixtures/sample-score.pdf
#	web/tests/test_application.py