ㄻㄴㄹㄴㅇㄹㄴㅇㄹㄴㅇㄹㅇ
Merge remote-tracking branch 'origin/master'

Conflicts:
	tester/src/com/example/tester/MainActivity.java