add to track styling and template
Merge branch 'develop' of github.com:jemboh/mixtapes into feature/flipcard
Merge branch 'develop' of github.com:jemboh/mixtapes into styling/welcome_page