Emulator Conflict
Merge branch 'master' of https://github.com/jkim0/TestProject
Emulator