test
Merge branch 'master' of https://github.com/Lighty04/friend_finder.git
FindAFriend
Merge branch 'master' of https://github.com/Lighty04/friend_finder.git

Conflicts:
	FriendFinder/src/com/example/friendfinder/DatabaseHelper.java
	FriendFinder/src/com/example/friendfinder/ServiceImpl.java
	FriendFinder/src/com/example/friendfinder/ServiceInterface.java