changed something in atlas apparently
Merge remote-tracking branch 'origin/master' into Matts-Branch
made so clicker deactivated when shop clicked (clicks were going through)
pre-merge