# Conflicts:
#   myproject/myapp/payments.py
#   myproject/myapp/urls.py

Brodybranch

See merge request !26

Implemented/hopefully fixed login/logout/register functionality.

See merge request !25

Extended User model with Profile model and used signals to automatically create a Profile instance when a User instance is created.
Styled authentication templates/forms.
To change usertypes of users, create superuser and change usertype in admin panel.

Merging to pull?
.

Removed temporary local audio file

See merge request !23

Fixed soundfile import error and prediction results now display correctly....

See merge request !22

# Conflicts:
#   myproject/myapp/urls.py