changed
alert with no text
Merge branch 'master' of https://github.com/rajgitter/test

Conflicts:
	test.js