Most of the changes by Andres done
Merge branch 'master' of https://github.com/a-delrio/ama-music-website