Added pairing logic.
Merge branch 'develop'
removing .classes
added ok button and listener
removed .class files
added new functionality
implemented edit functionality.
implemented delete.
added hide button
delete stuff
edit stuff
Merge branch 'master' of https://github.com/fandg/family

Conflicts:
	family/src/com/example/family/Main.java
choosing functionality
removed .class from source
layout changes
fixed rotation issue
fix keyboard issue
Merge branch 'master' of https://github.com/fandg/family

Conflicts:
	family/res/layout/main.xml
name list wont overwrite buttons now.
scroll list improvements
fixed random selection in choose
updated list scrooll
added layout fixes