/z/bf getting pulled
/JIK/Merge branch 'master' of https://github.com/jkim0/TestProject

Conflicts:
	Emulator/src/com/example/emulator/NanoHTTPD.java
/Merge branch 'master' of https://github.com/jkim0/TestProject

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