First demo with btn and tv
again
Merge branch 'master' of https://github.com/bng86/pairProgramming

Conflicts:
	res/layout/activity_main.xml