on merging Nick-Testing with mikebranch it will not show maps, this may not be related to the merge since i had the issue of maps not showing before the merge. But I have decided to keep the merge instead of hard reseting and seeing if we can fix this small issue.
~ mikebranch can go on we will just fix the issue and re-merge if needed, it won't be as big of a merge the second time around.
on merging Nick-Testing with mikebranch it will not show maps, this may not be related to the merge since i had the issue of maps not showing before the merge. But I have decided to keep the merge instead of hard reseting and seeing if we can fix this small issue. ~ mikebranch can go on we will just fix the issue and re-merge if needed, it won't be as big of a merge the second time around.