explanation
Merge branch 'master' of https://github.com/tobyli/Atlasify

Conflicts:
	atlasify.js