Twitter code

Initial commit
Challenge links corrected in challenge class
File writer

FileMan
Merge remote-tracking branch 'origin/master'

Conflicts:

	ChallengeYourFriends/bin/classes/com/cyf/challengeyourfriends/LoginActivity$1.class

	ChallengeYourFriends/bin/classes/com/cyf/challengeyourfriends/LoginActivity$2.class

	ChallengeYourFriends/bin/classes/com/cyf/challengeyourfriends/LoginActivity$3.class

	ChallengeYourFriends/bin/classes/com/cyf/challengeyourfriends/LoginActivity$4.class

	ChallengeYourFriends/bin/classes/com/cyf/challengeyourfriends/LoginActivity$ProfileQuery.class

	ChallengeYourFriends/bin/classes/com/cyf/challengeyourfriends/LoginActivity$UserLoginTask.class

	ChallengeYourFriends/bin/classes/com/cyf/challengeyourfriends/LoginActivity.class

	ChallengeYourFriends/bin/classes/com/cyf/challengeyourfriends/MainActivity.class

	ChallengeYourFriends/bin/classes/com/cyf/challengeyourfriends/MenuActivity.class
	appcompat_v7/bin/appcompat_v7.jar
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.history/10/90253265746700141f5ab4fd707eeacc
	.metadata/.plugins/org.eclipse.core.resources/.history/15/50be4be66c6700141f5ab4fd707eeacc
	.metadata/.plugins/org.eclipse.core.resources/.history/56/90bb8a67746700141f5ab4fd707eeacc
	.metadata/.plugins/org.eclipse.core.resources/.history/61/c0204d56746700141f5ab4fd707eeacc
	.metadata/.plugins/org.eclipse.core.resources/.history/65/f0c798d3746700141f5ab4fd707eeacc
	.metadata/.plugins/org.eclipse.core.resources/.history/7/a004a6a7746700141f5ab4fd707eeacc
	.metadata/.plugins/org.eclipse.core.resources/.history/7f/a072a5e26c6700141f5ab4fd707eeacc
	.metadata/.plugins/org.eclipse.core.resources/.history/82/d0bb86c2cc4f00141b45fe16b94b0da9
	.metadata/.plugins/org.eclipse.core.resources/.history/96/c0ff0d57746700141f5ab4fd707eeacc
	.metadata/.plugins/org.eclipse.core.resources/.history/9a/e0952b65746700141f5ab4fd707eeacc
	.metadata/.plugins/org.eclipse.core.resources/.history/b3/709ae7e46c6700141f5ab4fd707eeacc
	.metadata/.plugins/org.eclipse.core.resources/.history/c/9088f44c286000141d5efc9c3a34e7ea
	.metadata/.plugins/org.eclipse.core.resources/.history/cd/90fab23f286000141d5efc9c3a34e7ea
	.metadata/.plugins/org.eclipse.core.resources/.history/e1/20f63565746700141f5ab4fd707eeacc
	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.location
	.metadata/.plugins/org.eclipse.core.resources/.projects/ChallengeYourFriends/.indexes/e4/81/b0/bf/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/ChallengeYourFriends/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/ChallengeYourFriends/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/ChallengeYourFriends/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/13.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/144246458.index
	.metadata/.plugins/org.eclipse.jdt.core/1788731117.index
	.metadata/.plugins/org.eclipse.jdt.core/1836263836.index
	.metadata/.plugins/org.eclipse.jdt.core/1994326752.index
	.metadata/.plugins/org.eclipse.jdt.core/2125051269.index
	.metadata/.plugins/org.eclipse.jdt.core/2314659021.index
	.metadata/.plugins/org.eclipse.jdt.core/2669342755.index
	.metadata/.plugins/org.eclipse.jdt.core/2701506413.index
	.metadata/.plugins/org.eclipse.jdt.core/2752521146.index
	.metadata/.plugins/org.eclipse.jdt.core/2963160800.index
	.metadata/.plugins/org.eclipse.jdt.core/3018105441.index
	.metadata/.plugins/org.eclipse.jdt.core/3078989070.index
	.metadata/.plugins/org.eclipse.jdt.core/341090687.index
	.metadata/.plugins/org.eclipse.jdt.core/4115019006.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	ChallengeYourFriends/bin/ChallengeYourFriends.apk
	ChallengeYourFriends/bin/classes.dex
	ChallengeYourFriends/bin/classes/com/cyf/challengeyourfriends/MenuActivity.class
	ChallengeYourFriends/bin/dexedLibs/android-support-v4-2a20e15ed1a995348c165301848215d4.jar
	ChallengeYourFriends/bin/dexedLibs/android-support-v4-68ad1176c4f3fc1e038e5ae7d4c5447d.jar
	ChallengeYourFriends/bin/dexedLibs/android-support-v4-8dbe45e72470c951bb01ac1c8cdba859.jar
	ChallengeYourFriends/bin/dexedLibs/android-support-v7-appcompat-07854ee9169199d776daac0b4f0b3c95.jar
	ChallengeYourFriends/bin/dexedLibs/android-support-v7-appcompat-82a3b0c33831b0e5b26fb69e4c26a29e.jar
	ChallengeYourFriends/bin/dexedLibs/android-support-v7-appcompat-f49327b58a3fc3f5a77296387f59fac6.jar
	ChallengeYourFriends/bin/jarlist.cache
	ChallengeYourFriends/bin/resources.ap_
	appcompat_v7/bin/appcompat_v7.jar