updated files for above text
Merge branch 'master' of https://github.com/wesreisz/classLab7

Conflicts:
	files/res/layout/layout4.xml