changed addresses so that they are embeds_one on locations
added a map and fiddled with the layout
added word break to scss fixes #163 I think
made the x not cause a line break fixes #161
Merge branch 'master' of https://github.com/notionparallax/ShadowWolf into issue141
Merge pull request #195 from notionparallax/issue141

Issue141