Added generated javascript to ignore file
deleted main.js generated file
Merge branch 'master' of github.com:QBobble/fuzzy-adventure

Conflicts:
	js/main.js