/WEDS, MORNING /
merge
Merge branch 'master' of https://github.com/jkim0/TestProject

Conflicts:
	Emulator/src/com/example/emulator/EmulatorService.java
	Emulator/src/com/example/emulator/NanoHTTPD.java