slider images change
conflict resolved
Merge branch 'master' of https://github.com/lftechnologyinc/hack_unicorn