js and jscss files added
conflict resolved
Merge branch 'master' of github.com:lftechnologyinc/hack_unicorn