new stuff
commit
dazdadadazd
Merge branch 'API2' of https://github.com/Lighty04/friend_finder.git
into API2

Conflicts:
	FriendFinder/gen/com/example/friendfinder/R.java
	FriendFinder/src/com/example/friendfinder/Business.java
	FriendFinder/src/com/example/friendfinder/MainActivity.java