fix alert message
fix main.js

Conflicts:
	js/main.js