6th commit
6th commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/clo/testproject/MainActivity.java
7th commit