resolved main.js conflict!
Merge remote-tracking branch 'origin/radu.moldovan/slideView'