another commit
Merge branch 'master' of
https://github.com/sinnott74/AndroidProject2.git

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