ignore
Adalbero Conflito 3
Merge branch 'master' of https://github.com/adalbero/PublicAndroidRepo

Conflicts:
	MyFirstApp/res/layout/activity_main.xml