added hide button
delete stuff
edit stuff
Merge branch 'master' of https://github.com/fandg/family

Conflicts:
	family/src/com/example/family/Main.java