this works
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/project/NuesoftG6/mainActivity.java
this works