Changes to be committed:
	modified:   Yamba/project.properties
Merge branch 'master' of
https://github.com/sshlafman/AndroidBootCamp2012.git

Conflicts:
	Yamba/project.properties
Lesson 8 completed
Lessons 9 and 10 completed