Adding Comment Feature1
Adding comment master
Merge branch 'feature1'

Conflicts:
	src/com/example/test/MainActivity.java