fix adjustement
resolving conflict
new commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Sa7i7AlBoukhari/src/com/sa7i7alboukhari/MainActivity.java
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit a32d41c6f61e9fa23ca4a710b951035c5139f9c1.