Fixing gender select box
Fixing merge conflicts
Merge branch 'develop' of github.com:jemboh/mixtapes into develop