Merge branch 'master' of https://github.com/OllieB/FriendLend

Conflicts:
	FriendLend.xcodeproj/project.pbxproj