added underscore local lib
added underscore to index
fixed merge conflict
Merge branch 'master' of https://github.com/jonalonn/sexinsweden