/bf mergeconflict/
Merge branch 'master' of https://github.com/jkim0/TestProject
/j/
Merge branch 'master' of https://github.com/jkim0/TestProject
/Zuckay b4 dealing with wifi issues/
/Merge branch 'master' of https://github.com/jkim0/TestProject

Conflicts:
	Emulator/src/com/example/emulator/EmulatorService.java
/Done Wifi/
/wifi Done/
Merge branch 'master' of https://github.com/jkim0/TestProject