a
Merge branch 'master' of https://github.com/andyngoc/repos into new5

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