Lastest
Merge branch 'master' of https://github.com/Sushindhran/AJSGameEmulator

Conflicts:
	js/emulatorMain.js