test2
Merge remote-tracking branch 'origin/master'

Conflicts:
	VersionControlTesting/src/com/example/versioncontroltesting/MainActivity.java