sjfkljf
fixed friends merge Merge branch 'master' of github.com:luolisa/DartCal

Conflicts:
	src/edu/dartmouth/cs/DartCal/FriendsFragment.java