add ant buildfiles
Merge branch 'master' into soln

Conflicts:
	src/Connection.java
	src/SocialNetwork.java