. -> /

trying to get alert
Merge branch 'master' of https://github.com/andrewj1990/A3

Conflicts:
	main.js