Merge branch 'feature/authentication' of github.com:davidjconnolly/jonsmusic into feature/authentication
Merge pull request #1 from davidjconnolly/feature/authentication

Feature/authentication
Merge branch 'master' of github.com:davidjconnolly/jonsmusic
Merge branch 'master' of github.com:davidjconnolly/jonsmusic