testing merge conflict
Merge branch 'master' of https://github.com/Encrypter8/Popups

Conflicts:
	src/jquery.popups.new.js