data change
Merge branch 'master' of https://github.com/ellejay/scotis3

Conflicts:
	areas.json