/editing XML file-from Zuckay/
Merge branch 'master' of https://github.com/jkim0/TestProject
/AFTER FILE open/
Merge branch 'master' of https://github.com/jkim0/TestProject

Conflicts:
	Emulator/assets/index.html