updated calculateOffset a bit
Merge branch 'master' of https://github.com/Encrypter8/Popups

Conflicts:
	testing.html