Small changes
Conflicts...
Images inside nodes
Merge branch 'master' of https://github.com/tomrunia/music-explorer