jbuilder locations controller
Merge branch 'master' of https://github.com/kristiankyvik/meet-me

uggjhggjhgjgjhgjhgjhgjhgjhgjhgjhgh