View Friends is done
view
Merge branch 'master' of https://github.com/arjunswaj/facebook.git

Conflicts:
	project/src/edu/iiitb/facebook/action/dao/impl/FriendsDAOImpl.java
	project/src/struts.xml