[OCD] Committing Updates JS file + started looking at Java backend for two playeryness
[OCD] Committing gitignore
Merge origin/master

Conflicts:
	Mario_vs_Luigi.js