pathing done, some of views done
merge conflict done
conflict resolution
Merge branch 'master' of github.com:dlopezh/hiphop_artists_crud