Added subscriptions
Merge branch 'master' of https://github.com/griffindj/umw_330

Conflicts:
	trunk/twitterAlt/src/main/java/edu/umw/cpsc/twitterAlt/view/routes/ProfileGetRoute.java