new new new new framework version, some changes to fans plugin
Merge branch 'master' of https://github.com/seanjames777/15214

Conflicts:
	team17/trunk/src/main/java/edu/cmu/cs/cs214/hw5/main/Main.java
	team17/trunk/target/classes/edu/cmu/cs/cs214/hw5/framework/Request.class
	team17/trunk/target/classes/edu/cmu/cs/cs214/hw5/main/Main.class
	team17/trunk/target/classes/edu/cmu/cs/cs214/hw5/samplePlugins/followList/FollowerListPlugin.class
	team17/trunk/target/classes/edu/cmu/cs/cs214/hw5/samplePlugins/followList/FollowerListPluginPanel.class
	team17/trunk/target/classes/edu/cmu/cs/cs214/hw5/shared/TwUser.class