contacts view

bbbb
add contacts added
commit
Merge branch 'aa'

Conflicts:
	app/AndroidManifest.xml
	app/gen/org/coursework/R.java