changes to main.js
Merge branch 'master' of https://github.com/zort/CSC309-Assignments

Conflicts:
	main.js