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

Conflicts:
	FriendFinder/src/com/example/friendfinder/MainActivity.java