Dumb push
fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	rci/src/main/java/com/example/rci/rci/MainActivity.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
added log in