Update MainActivity.java
Merge test
update!! remote