Added a comment
new comment
Merge branch 'BeforeComment'

Conflicts:
	src/testandroid.java