changed
changed gitignore
Merge branch 'master' of https://github.com/junseol86/OneRoomHandongi

Conflicts:
	OneRoomHandongi/res/layout/map.xml
	OneRoomHandongi/src/com/example/oneroomhandongi/MainActivity.java
	OneRoomHandongi/src/com/example/oneroomhandongi/Map.java