class path clean up
test
git ignore
Merge branch 'master' of https://github.com/fandg/family into develop

Conflicts:
	family/.classpath
	family/src/com/example/family/Main.java
Merge branch 'develop'