/Zu/
/dontkno/Merge branch 'master' of https://github.com/jkim0/TestProject

Conflicts:
	Emulator/.gitignore
	Emulator/gen/com/example/emulator/EmulatorAIDL.java
	Emulator/gen/com/example/emulator/EmulatorAIDLCallback.java
	Emulator/gen/com/example/emulator/R.java
	Emulator/src/com/example/emulator/EmulatorService.java
	Emulator/src/com/example/emulator/NanoHTTPD.java