location placeholder
Merge branch 'master' into design
Merge pull request #71 from arieldiamond/design

Design