Added Edinburgh chapter to Locations page
Merge branch 'pr/110'