routine
Merge branch 'newmap' of https://github.com/richmondwatkins/quest4change into user
Map merge
group edit
Merge branch 'master' of https://github.com/richmondwatkins/quest4change into user
custom icons
add check in route
merge
fix checkin link on map callout
merge
merge
fix bad merge
add user location icon to map
'is this thing on'
Merge branch 'master' of https://github.com/richmondwatkins/quest4change
check in icons set
word
fixed conflicts
Merge pull request #2 from richmondwatkins/user

User
merge