logo image adds, login logout adds
conflict resolve in header
Merge branch 'master' of https://github.com/lftechnologyinc/hack_unicorn