lsjf
Merge branch 'develop' of https://github.com/cooper09/simpleproto into develop
added fill in images and location display