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
'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