type message
Alert Box
Merge branch 'master' of github.com:vc-dig1102/assignments

Conflicts:
	alert.html
	calculator.html