added public/js/main.js to gitignore
Merge branch 'master' of https://github.com/adamzwakk/scumm-clone

Conflicts:
	public/js/main.js