Working Copy
Merge branch 'master' of https://github.com/DannyPaguiao/Prototype3

Conflicts:
	js/Game.js