feed and profile
Merge branch 'master' of github.com:JoeDailey/cs638-ShoutoutLoud

Conflicts:
	ShoutOutLoud/app/controllers/TweetManager.java