artist slideshow underway
fixed the conflict
Merge branch 'master' of github.com:kvnwinata/rocketscience