Updated main.js with marcy IP address.
Merge branch 'master' of github.com:ebanner/text-editing-tournament
Merge branch 'master' of github.com:ebanner/text-editing-tournament

Conflicts:
	display/main.js