test
Merge branch 'master' of https://github.com/justek-Wade/Hello.git
Mike
Merge branch 'master' of https://github.com/justek-Wade/Hello.git

Conflicts:
	Hello/src/com/example/hello/MainActivity.java
jjjjj